backlight: Separate backlight properties from backlight ops pointers

Per device data such as brightness belongs to the indivdual device
and should therefore be separate from the the backlight operation
function pointers. This patch splits the two types of data and
allows simplifcation of some code.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>

2 files changed, 32 insertions, 24 deletions

diff --git a/include/linux/backlight.h b/include/linux/backlight.h
index 43c6d55644b5..1023ba0d6e55 100644
--- a/include/linux/backlight.h
+++ b/include/linux/backlight.h
@@ -14,8 +14,8 @@
 
 /* Notes on locking:
  *
- * backlight_device->props_lock is an internal backlight lock protecting the
- * props field and no code outside the core should need to touch it.
+ * backlight_device->ops_lock is an internal backlight lock protecting the
+ * ops pointer and no code outside the core should need to touch it.
  *
  * Access to update_status() is serialised by the update_lock mutex since
  * most drivers seem to need this and historically get it wrong.
@@ -30,9 +30,7 @@
 struct backlight_device;
 struct fb_info;
 
-/* This structure defines all the properties of a backlight
-   (usually attached to a LCD). */
-struct backlight_properties {
+struct backlight_ops {
         /* Notify the backlight driver some property has changed */
         int (*update_status)(struct backlight_device *);
         /* Return the current backlight brightness (accounting for power,
@@ -41,7 +39,10 @@ struct backlight_properties {
         /* Check if given framebuffer device is the one bound to this backlight;
            return 0 if not, !=0 if it is. If NULL, backlight always matches the fb. */
         int (*check_fb)(struct fb_info *);
+};
 
+/* This structure defines all the properties of a backlight */
+struct backlight_properties {
         /* Current User requested brightness (0 - max_brightness) */
         int brightness;
         /* Maximal value for brightness (read-only) */
@@ -54,14 +55,18 @@ struct backlight_properties {
 };
 
 struct backlight_device {
-        /* This protects the 'props' field. If 'props' is NULL, the driver that
-           registered this device has been unloaded, and if class_get_devdata()
-           points to something in the body of that driver, it is also invalid. */
-        struct mutex props_lock;
-        /* If this is NULL, the backing module is unloaded */
-        struct backlight_properties *props;
+        /* Backlight properties */
+        struct backlight_properties props;
+
         /* Serialise access to update_status method */
         struct mutex update_lock;
+
+        /* This protects the 'ops' field. If 'ops' is NULL, the driver that
+           registered this device has been unloaded, and if class_get_devdata()
+           points to something in the body of that driver, it is also invalid. */
+        struct mutex ops_lock;
+        struct backlight_ops *ops;
+
         /* The framebuffer notifier block */
         struct notifier_block fb_notif;
         /* The class device structure */
@@ -71,13 +76,13 @@ struct backlight_device {
 static inline void backlight_update_status(struct backlight_device *bd)
 {
         mutex_lock(&bd->update_lock);
-        if (bd->props && bd->props->update_status)
-                bd->props->update_status(bd);
+        if (bd->ops && bd->ops->update_status)
+                bd->ops->update_status(bd);
         mutex_unlock(&bd->update_lock);
 }
 
 extern struct backlight_device *backlight_device_register(const char *name,
-        struct device *dev,void *devdata,struct backlight_properties *bp);
+        struct device *dev, void *devdata, struct backlight_ops *ops);
 extern void backlight_device_unregister(struct backlight_device *bd);
 
 #define to_backlight_device(obj) container_of(obj, struct backlight_device, class_dev)
diff --git a/include/linux/lcd.h b/include/linux/lcd.h
index 46970af2ca89..598793c0745b 100644
--- a/include/linux/lcd.h
+++ b/include/linux/lcd.h
@@ -14,7 +14,7 @@
 
 /* Notes on locking:
  *
- * lcd_device->props_lock is an internal backlight lock protecting the props
+ * lcd_device->ops_lock is an internal backlight lock protecting the ops
  * field and no code outside the core should need to touch it.
  *
  * Access to set_power() is serialised by the update_lock mutex since
@@ -30,15 +30,17 @@
 struct lcd_device;
 struct fb_info;
 
-/* This structure defines all the properties of a LCD flat panel. */
 struct lcd_properties {
+        /* The maximum value for contrast (read-only) */
+        int max_contrast;
+};
+
+struct lcd_ops {
         /* Get the LCD panel power status (0: full on, 1..3: controller
            power on, flat panel power off, 4: full off), see FB_BLANK_XXX */
         int (*get_power)(struct lcd_device *);
         /* Enable or disable power to the LCD (0: on; 4: off, see FB_BLANK_XXX) */
         int (*set_power)(struct lcd_device *, int power);
-        /* The maximum value for contrast (read-only) */
-        int max_contrast;
         /* Get the current contrast setting (0-max_contrast) */
         int (*get_contrast)(struct lcd_device *);
         /* Set LCD panel contrast */
@@ -49,12 +51,13 @@ struct lcd_properties {
 };
 
 struct lcd_device {
-        /* This protects the 'props' field. If 'props' is NULL, the driver that
+        struct lcd_properties props;
+        /* This protects the 'ops' field. If 'ops' is NULL, the driver that
            registered this device has been unloaded, and if class_get_devdata()
            points to something in the body of that driver, it is also invalid. */
-        struct mutex props_lock;
+        struct mutex ops_lock;
         /* If this is NULL, the backing module is unloaded */
-        struct lcd_properties *props;
+        struct lcd_ops *ops;
         /* Serialise access to set_power method */
         struct mutex update_lock;
         /* The framebuffer notifier block */
@@ -66,13 +69,13 @@ struct lcd_device {
 static inline void lcd_set_power(struct lcd_device *ld, int power)
 {
         mutex_lock(&ld->update_lock);
-        if (ld->props && ld->props->set_power)
-                ld->props->set_power(ld, power);
+        if (ld->ops && ld->ops->set_power)
+                ld->ops->set_power(ld, power);
         mutex_unlock(&ld->update_lock);
 }
 
 extern struct lcd_device *lcd_device_register(const char *name,
-        void *devdata, struct lcd_properties *lp);
+        void *devdata, struct lcd_ops *ops);
 extern void lcd_device_unregister(struct lcd_device *ld);
 
 #define to_lcd_device(obj) container_of(obj, struct lcd_device, class_dev)