backlight: Separate backlight properties from backlight ops pointers

[linux-2.6-omap-h63xx.git] / drivers / acpi / ibm_acpi.c

diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
index 1a0ed3dc409c8426d1e79f084a1ce0e38451bac7..4cc534e36e81cb3308c8d4015bca2280fbe1f914 100644 (file)
--- a/drivers/acpi/ibm_acpi.c
+++ b/drivers/acpi/ibm_acpi.c
@@ -1701,14 +1701,12 @@ static int brightness_write(char *buf)
 
 static int brightness_update_status(struct backlight_device *bd)
 {
-       return brightness_set(bd->props->brightness);
+       return brightness_set(bd->props.brightness);
 }
 
-static struct backlight_properties ibm_backlight_data = {
-        .owner          = THIS_MODULE,
+static struct backlight_ops ibm_backlight_data = {
         .get_brightness = brightness_get,
         .update_status  = brightness_update_status,
-        .max_brightness = 7,
 };
 
 static int brightness_init(void)
@@ -1720,6 +1718,8 @@ static int brightness_init(void)
                return PTR_ERR(ibm_backlight_device);
        }
 
+        ibm_backlight_device->props.max_brightness = 7;
+
        return 0;
 }