Commit 9905a43b2d563e6f89e4c63c4278ada03f2ebb14
Committed by
Richard Purdie
1 parent
6baddba4a4
Exists in
master
and in
7 other branches
backlight: Constify struct backlight_ops
Signed-off-by: Emese Revfy <re.emese@gmail.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Showing 19 changed files with 24 additions and 24 deletions Side-by-side Diff
- drivers/video/backlight/adp5520_bl.c
- drivers/video/backlight/adx_bl.c
- drivers/video/backlight/atmel-pwm-bl.c
- drivers/video/backlight/backlight.c
- drivers/video/backlight/corgi_lcd.c
- drivers/video/backlight/cr_bllcd.c
- drivers/video/backlight/da903x_bl.c
- drivers/video/backlight/generic_bl.c
- drivers/video/backlight/hp680_bl.c
- drivers/video/backlight/jornada720_bl.c
- drivers/video/backlight/kb3886_bl.c
- drivers/video/backlight/locomolcd.c
- drivers/video/backlight/mbp_nvidia_bl.c
- drivers/video/backlight/omap1_bl.c
- drivers/video/backlight/progear_bl.c
- drivers/video/backlight/pwm_bl.c
- drivers/video/backlight/tosa_bl.c
- drivers/video/backlight/wm831x_bl.c
- include/linux/backlight.h
drivers/video/backlight/adp5520_bl.c
... | ... | @@ -85,7 +85,7 @@ |
85 | 85 | return error ? data->current_brightness : reg_val; |
86 | 86 | } |
87 | 87 | |
88 | -static struct backlight_ops adp5520_bl_ops = { | |
88 | +static const struct backlight_ops adp5520_bl_ops = { | |
89 | 89 | .update_status = adp5520_bl_update_status, |
90 | 90 | .get_brightness = adp5520_bl_get_brightness, |
91 | 91 | }; |
drivers/video/backlight/adx_bl.c
drivers/video/backlight/atmel-pwm-bl.c
... | ... | @@ -113,7 +113,7 @@ |
113 | 113 | return pwm_channel_enable(&pwmbl->pwmc); |
114 | 114 | } |
115 | 115 | |
116 | -static struct backlight_ops atmel_pwm_bl_ops = { | |
116 | +static const struct backlight_ops atmel_pwm_bl_ops = { | |
117 | 117 | .get_brightness = atmel_pwm_bl_get_intensity, |
118 | 118 | .update_status = atmel_pwm_bl_set_intensity, |
119 | 119 | }; |
drivers/video/backlight/backlight.c
... | ... | @@ -269,7 +269,7 @@ |
269 | 269 | * ERR_PTR() or a pointer to the newly allocated device. |
270 | 270 | */ |
271 | 271 | struct backlight_device *backlight_device_register(const char *name, |
272 | - struct device *parent, void *devdata, struct backlight_ops *ops) | |
272 | + struct device *parent, void *devdata, const struct backlight_ops *ops) | |
273 | 273 | { |
274 | 274 | struct backlight_device *new_bd; |
275 | 275 | int rc; |
drivers/video/backlight/corgi_lcd.c
... | ... | @@ -451,7 +451,7 @@ |
451 | 451 | } |
452 | 452 | EXPORT_SYMBOL(corgi_lcd_limit_intensity); |
453 | 453 | |
454 | -static struct backlight_ops corgi_bl_ops = { | |
454 | +static const struct backlight_ops corgi_bl_ops = { | |
455 | 455 | .get_brightness = corgi_bl_get_intensity, |
456 | 456 | .update_status = corgi_bl_update_status, |
457 | 457 | }; |
drivers/video/backlight/cr_bllcd.c
... | ... | @@ -108,7 +108,7 @@ |
108 | 108 | return intensity; |
109 | 109 | } |
110 | 110 | |
111 | -static struct backlight_ops cr_backlight_ops = { | |
111 | +static const struct backlight_ops cr_backlight_ops = { | |
112 | 112 | .get_brightness = cr_backlight_get_intensity, |
113 | 113 | .update_status = cr_backlight_set_intensity, |
114 | 114 | }; |
drivers/video/backlight/da903x_bl.c
... | ... | @@ -95,7 +95,7 @@ |
95 | 95 | return data->current_brightness; |
96 | 96 | } |
97 | 97 | |
98 | -static struct backlight_ops da903x_backlight_ops = { | |
98 | +static const struct backlight_ops da903x_backlight_ops = { | |
99 | 99 | .update_status = da903x_backlight_update_status, |
100 | 100 | .get_brightness = da903x_backlight_get_brightness, |
101 | 101 | }; |
drivers/video/backlight/generic_bl.c
... | ... | @@ -70,7 +70,7 @@ |
70 | 70 | } |
71 | 71 | EXPORT_SYMBOL(corgibl_limit_intensity); |
72 | 72 | |
73 | -static struct backlight_ops genericbl_ops = { | |
73 | +static const struct backlight_ops genericbl_ops = { | |
74 | 74 | .options = BL_CORE_SUSPENDRESUME, |
75 | 75 | .get_brightness = genericbl_get_intensity, |
76 | 76 | .update_status = genericbl_send_intensity, |
drivers/video/backlight/hp680_bl.c
drivers/video/backlight/jornada720_bl.c
... | ... | @@ -93,7 +93,7 @@ |
93 | 93 | return ret; |
94 | 94 | } |
95 | 95 | |
96 | -static struct backlight_ops jornada_bl_ops = { | |
96 | +static const struct backlight_ops jornada_bl_ops = { | |
97 | 97 | .get_brightness = jornada_bl_get_brightness, |
98 | 98 | .update_status = jornada_bl_update_status, |
99 | 99 | .options = BL_CORE_SUSPENDRESUME, |
drivers/video/backlight/kb3886_bl.c
drivers/video/backlight/locomolcd.c
drivers/video/backlight/mbp_nvidia_bl.c
drivers/video/backlight/omap1_bl.c
drivers/video/backlight/progear_bl.c
drivers/video/backlight/pwm_bl.c
... | ... | @@ -56,7 +56,7 @@ |
56 | 56 | return bl->props.brightness; |
57 | 57 | } |
58 | 58 | |
59 | -static struct backlight_ops pwm_backlight_ops = { | |
59 | +static const struct backlight_ops pwm_backlight_ops = { | |
60 | 60 | .update_status = pwm_backlight_update_status, |
61 | 61 | .get_brightness = pwm_backlight_get_brightness, |
62 | 62 | }; |
drivers/video/backlight/tosa_bl.c
drivers/video/backlight/wm831x_bl.c
... | ... | @@ -112,7 +112,7 @@ |
112 | 112 | return data->current_brightness; |
113 | 113 | } |
114 | 114 | |
115 | -static struct backlight_ops wm831x_backlight_ops = { | |
115 | +static const struct backlight_ops wm831x_backlight_ops = { | |
116 | 116 | .options = BL_CORE_SUSPENDRESUME, |
117 | 117 | .update_status = wm831x_backlight_update_status, |
118 | 118 | .get_brightness = wm831x_backlight_get_brightness, |
include/linux/backlight.h
... | ... | @@ -36,18 +36,18 @@ |
36 | 36 | struct fb_info; |
37 | 37 | |
38 | 38 | struct backlight_ops { |
39 | - unsigned int options; | |
39 | + const unsigned int options; | |
40 | 40 | |
41 | 41 | #define BL_CORE_SUSPENDRESUME (1 << 0) |
42 | 42 | |
43 | 43 | /* Notify the backlight driver some property has changed */ |
44 | - int (*update_status)(struct backlight_device *); | |
44 | + int (* const update_status)(struct backlight_device *); | |
45 | 45 | /* Return the current backlight brightness (accounting for power, |
46 | 46 | fb_blank etc.) */ |
47 | - int (*get_brightness)(struct backlight_device *); | |
47 | + int (* const get_brightness)(struct backlight_device *); | |
48 | 48 | /* Check if given framebuffer device is the one bound to this backlight; |
49 | 49 | return 0 if not, !=0 if it is. If NULL, backlight always matches the fb. */ |
50 | - int (*check_fb)(struct fb_info *); | |
50 | + int (* const check_fb)(struct fb_info *); | |
51 | 51 | }; |
52 | 52 | |
53 | 53 | /* This structure defines all the properties of a backlight */ |
... | ... | @@ -86,7 +86,7 @@ |
86 | 86 | registered this device has been unloaded, and if class_get_devdata() |
87 | 87 | points to something in the body of that driver, it is also invalid. */ |
88 | 88 | struct mutex ops_lock; |
89 | - struct backlight_ops *ops; | |
89 | + const struct backlight_ops *ops; | |
90 | 90 | |
91 | 91 | /* The framebuffer notifier block */ |
92 | 92 | struct notifier_block fb_notif; |
... | ... | @@ -103,7 +103,7 @@ |
103 | 103 | } |
104 | 104 | |
105 | 105 | extern struct backlight_device *backlight_device_register(const char *name, |
106 | - struct device *dev, void *devdata, struct backlight_ops *ops); | |
106 | + struct device *dev, void *devdata, const struct backlight_ops *ops); | |
107 | 107 | extern void backlight_device_unregister(struct backlight_device *bd); |
108 | 108 | extern void backlight_force_update(struct backlight_device *bd, |
109 | 109 | enum backlight_update_reason reason); |