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>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
index 3c5abbf0d042..d1312477813e 100644
--- a/drivers/video/backlight/locomolcd.c
+++ b/drivers/video/backlight/locomolcd.c
@@ -112,11 +112,11 @@ static int current_intensity;
 
 static int locomolcd_set_intensity(struct backlight_device *bd)
 {
-        int intensity = bd->props->brightness;
+        int intensity = bd->props.brightness;
 
-        if (bd->props->power != FB_BLANK_UNBLANK)
+        if (bd->props.power != FB_BLANK_UNBLANK)
                 intensity = 0;
-        if (bd->props->fb_blank != FB_BLANK_UNBLANK)
+        if (bd->props.fb_blank != FB_BLANK_UNBLANK)
                 intensity = 0;
         if (locomolcd_flags & LOCOMOLCD_SUSPENDED)
                 intensity = 0;
@@ -141,10 +141,9 @@ static int locomolcd_get_intensity(struct backlight_device *bd)
         return current_intensity;
 }
 
-static struct backlight_properties locomobl_data = {
+static struct backlight_ops locomobl_data = {
         .get_brightness = locomolcd_get_intensity,
         .update_status  = locomolcd_set_intensity,
-        .max_brightness = 4,
 };
 
 #ifdef CONFIG_PM
@@ -189,7 +188,8 @@ static int locomolcd_probe(struct locomo_dev *ldev)
                 return PTR_ERR (locomolcd_bl_device);
 
         /* Set up frontlight so that screen is readable */
-        locomobl_data.brightness = 2;
+        locomolcd_bl_device->props.max_brightness = 4,
+        locomolcd_bl_device->props.brightness = 2;
         locomolcd_set_intensity(locomolcd_bl_device);
 
         return 0;