14 files changed, 90 insertions, 55 deletions

diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index 226b3e93498c..cbca40aa4006 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -922,9 +922,13 @@ static struct backlight_ops acer_bl_ops = {
 
 static int __devinit acer_backlight_init(struct device *dev)
 {
+        struct backlight_properties props;
         struct backlight_device *bd;
 
-        bd = backlight_device_register("acer-wmi", dev, NULL, &acer_bl_ops);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = max_brightness;
+        bd = backlight_device_register("acer-wmi", dev, NULL, &acer_bl_ops,
+                                       &props);
         if (IS_ERR(bd)) {
                 printk(ACER_ERR "Could not register Acer backlight device\n");
                 acer_backlight_device = NULL;
@@ -935,7 +939,6 @@ static int __devinit acer_backlight_init(struct device *dev)
 
         bd->props.power = FB_BLANK_UNBLANK;
         bd->props.brightness = read_brightness(bd);
-        bd->props.max_brightness = max_brightness;
         backlight_update_status(bd);
         return 0;
 }
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 791fcf321506..db5f7db2ba33 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -639,12 +639,16 @@ static int asus_backlight_init(struct asus_laptop *asus)
 {
         struct backlight_device *bd;
         struct device *dev = &asus->platform_device->dev;
+        struct backlight_properties props;
 
         if (!acpi_check_handle(asus->handle, METHOD_BRIGHTNESS_GET, NULL) &&
             !acpi_check_handle(asus->handle, METHOD_BRIGHTNESS_SET, NULL) &&
             lcd_switch_handle) {
+                memset(&props, 0, sizeof(struct backlight_properties));
+                props.max_brightness = 15;
+
                 bd = backlight_device_register(ASUS_LAPTOP_FILE, dev,
-                                               asus, &asusbl_ops);
+                                               asus, &asusbl_ops, &props);
                 if (IS_ERR(bd)) {
                         pr_err("Could not register asus backlight device\n");
                         asus->backlight_device = NULL;
@@ -653,7 +657,6 @@ static int asus_backlight_init(struct asus_laptop *asus)
 
                 asus->backlight_device = bd;
 
-                bd->props.max_brightness = 15;
                 bd->props.power = FB_BLANK_UNBLANK;
                 bd->props.brightness = asus_read_brightness(bd);
                 backlight_update_status(bd);
diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c
index 1381430e1105..ee520357abaa 100644
--- a/drivers/platform/x86/asus_acpi.c
+++ b/drivers/platform/x86/asus_acpi.c
@@ -1481,6 +1481,7 @@ static void asus_acpi_exit(void)
 
 static int __init asus_acpi_init(void)
 {
+        struct backlight_properties props;
         int result;
 
         result = acpi_bus_register_driver(&asus_hotk_driver);
@@ -1507,15 +1508,17 @@ static int __init asus_acpi_init(void)
                 return -ENODEV;
         }
 
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = 15;
         asus_backlight_device = backlight_device_register("asus", NULL, NULL,
-                                                          &asus_backlight_data);
+                                                          &asus_backlight_data,
+                                                          &props);
         if (IS_ERR(asus_backlight_device)) {
                 printk(KERN_ERR "Could not register asus backlight device\n");
                 asus_backlight_device = NULL;
                 asus_acpi_exit();
                 return -ENODEV;
         }
-        asus_backlight_device->props.max_brightness = 15;
 
         return 0;
 }
diff --git a/drivers/platform/x86/classmate-laptop.c b/drivers/platform/x86/classmate-laptop.c
index 035a7dd65a3f..6670ed8f9e5b 100644
--- a/drivers/platform/x86/classmate-laptop.c
+++ b/drivers/platform/x86/classmate-laptop.c
@@ -462,11 +462,13 @@ static struct backlight_ops cmpc_bl_ops = {
 
 static int cmpc_bl_add(struct acpi_device *acpi)
 {
+        struct backlight_properties props;
         struct backlight_device *bd;
 
-        bd = backlight_device_register("cmpc_bl", &acpi->dev,
-                                       acpi->handle, &cmpc_bl_ops);
-        bd->props.max_brightness = 7;
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = 7;
+        bd = backlight_device_register("cmpc_bl", &acpi->dev, acpi->handle,
+                                       &cmpc_bl_ops, &props);
         dev_set_drvdata(&acpi->dev, bd);
         return 0;
 }
diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
index 2740b40aad9b..71ff1545a93e 100644
--- a/drivers/platform/x86/compal-laptop.c
+++ b/drivers/platform/x86/compal-laptop.c
@@ -291,12 +291,15 @@ static int __init compal_init(void)
         /* Register backlight stuff */
 
         if (!acpi_video_backlight_support()) {
-                compalbl_device = backlight_device_register("compal-laptop", NULL, NULL,
-                                                            &compalbl_ops);
+                struct backlight_properties props;
+                memset(&props, 0, sizeof(struct backlight_properties));
+                props.max_brightness = COMPAL_LCD_LEVEL_MAX - 1;
+                compalbl_device = backlight_device_register("compal-laptop",
+                                                            NULL, NULL,
+                                                            &compalbl_ops,
+                                                            &props);
                 if (IS_ERR(compalbl_device))
                         return PTR_ERR(compalbl_device);
-
-                compalbl_device->props.max_brightness = COMPAL_LCD_LEVEL_MAX-1;
         }
 
         ret = platform_driver_register(&compal_driver);
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index ef614979afe9..46435ac4684f 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -559,10 +559,14 @@ static int __init dell_init(void)
         release_buffer();
 
         if (max_intensity) {
-                dell_backlight_device = backlight_device_register(
-                        "dell_backlight",
-                        &platform_device->dev, NULL,
-                        &dell_ops);
+                struct backlight_properties props;
+                memset(&props, 0, sizeof(struct backlight_properties));
+                props.max_brightness = max_intensity;
+                dell_backlight_device = backlight_device_register("dell_backlight",
+                                                                  &platform_device->dev,
+                                                                  NULL,
+                                                                  &dell_ops,
+                                                                  &props);
 
                 if (IS_ERR(dell_backlight_device)) {
                         ret = PTR_ERR(dell_backlight_device);
@@ -570,7 +574,6 @@ static int __init dell_init(void)
                         goto fail_backlight;
                 }
 
-                dell_backlight_device->props.max_brightness = max_intensity;
                 dell_backlight_device->props.brightness =
                         dell_get_intensity(dell_backlight_device);
                 backlight_update_status(dell_backlight_device);
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 9a844caa3756..3fdf21e0052e 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -1131,18 +1131,20 @@ static int eeepc_backlight_notify(struct eeepc_laptop *eeepc)
 
 static int eeepc_backlight_init(struct eeepc_laptop *eeepc)
 {
+        struct backlight_properties props;
         struct backlight_device *bd;
 
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = 15;
         bd = backlight_device_register(EEEPC_LAPTOP_FILE,
-                                       &eeepc->platform_device->dev,
-                                       eeepc, &eeepcbl_ops);
+                                       &eeepc->platform_device->dev, eeepc,
+                                       &eeepcbl_ops, &props);
         if (IS_ERR(bd)) {
                 pr_err("Could not register eeepc backlight device\n");
                 eeepc->backlight_device = NULL;
                 return PTR_ERR(bd);
         }
         eeepc->backlight_device = bd;
-        bd->props.max_brightness = 15;
         bd->props.brightness = read_brightness(bd);
         bd->props.power = FB_BLANK_UNBLANK;
         backlight_update_status(bd);
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index 5f3320d468f6..c1074b32490e 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -1126,16 +1126,20 @@ static int __init fujitsu_init(void)
         /* Register backlight stuff */
 
         if (!acpi_video_backlight_support()) {
-                fujitsu->bl_device =
-                        backlight_device_register("fujitsu-laptop", NULL, NULL,
-                                                  &fujitsubl_ops);
+                struct backlight_properties props;
+
+                memset(&props, 0, sizeof(struct backlight_properties));
+                max_brightness = fujitsu->max_brightness;
+                props.max_brightness = max_brightness - 1;
+                fujitsu->bl_device = backlight_device_register("fujitsu-laptop",
+                                                               NULL, NULL,
+                                                               &fujitsubl_ops,
+                                                               &props);
                 if (IS_ERR(fujitsu->bl_device)) {
                         ret = PTR_ERR(fujitsu->bl_device);
                         fujitsu->bl_device = NULL;
                         goto fail_sysfs_group;
                 }
-                max_brightness = fujitsu->max_brightness;
-                fujitsu->bl_device->props.max_brightness = max_brightness - 1;
                 fujitsu->bl_device->props.brightness = fujitsu->brightness_level;
         }
 
diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
index c2b05da4289a..996223a7c009 100644
--- a/drivers/platform/x86/msi-laptop.c
+++ b/drivers/platform/x86/msi-laptop.c
@@ -683,11 +683,14 @@ static int __init msi_init(void)
                 printk(KERN_INFO "MSI: Brightness ignored, must be controlled "
                        "by ACPI video driver\n");
         } else {
+                struct backlight_properties props;
+                memset(&props, 0, sizeof(struct backlight_properties));
+                props.max_brightness = MSI_LCD_LEVEL_MAX - 1;
                 msibl_device = backlight_device_register("msi-laptop-bl", NULL,
-                                                         NULL, &msibl_ops);
+                                                         NULL, &msibl_ops,
+                                                         &props);
                 if (IS_ERR(msibl_device))
                         return PTR_ERR(msibl_device);
-                msibl_device->props.max_brightness = MSI_LCD_LEVEL_MAX-1;
         }
 
         ret = platform_driver_register(&msipf_driver);
diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
index f5f70d4c6913..fb7ccaae6563 100644
--- a/drivers/platform/x86/msi-wmi.c
+++ b/drivers/platform/x86/msi-wmi.c
@@ -249,12 +249,15 @@ static int __init msi_wmi_init(void)
                 goto err_uninstall_notifier;
 
         if (!acpi_video_backlight_support()) {
-                backlight = backlight_device_register(DRV_NAME,
-                                NULL, NULL, &msi_backlight_ops);
+                struct backlight_properties props;
+                memset(&props, 0, sizeof(struct backlight_properties));
+                props.max_brightness = ARRAY_SIZE(backlight_map) - 1;
+                backlight = backlight_device_register(DRV_NAME, NULL, NULL,
+                                                      &msi_backlight_ops,
+                                                      &props);
                 if (IS_ERR(backlight))
                         goto err_free_input;
 
-                backlight->props.max_brightness = ARRAY_SIZE(backlight_map) - 1;
                 err = bl_get(NULL);
                 if (err < 0)
                         goto err_free_backlight;
diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c
index c9fc479fc290..ab5c9cea1462 100644
--- a/drivers/platform/x86/panasonic-laptop.c
+++ b/drivers/platform/x86/panasonic-laptop.c
@@ -600,6 +600,7 @@ static int acpi_pcc_hotkey_resume(struct acpi_device *device)
 
 static int acpi_pcc_hotkey_add(struct acpi_device *device)
 {
+        struct backlight_properties props;
         struct pcc_acpi *pcc;
         int num_sifr, result;
 
@@ -637,24 +638,23 @@ static int acpi_pcc_hotkey_add(struct acpi_device *device)
         if (result) {
                 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                   "Error installing keyinput handler\n"));
-                goto out_sinf;
+                goto out_hotkey;
         }
 
-        /* initialize backlight */
-        pcc->backlight = backlight_device_register("panasonic", NULL, pcc,
-                                                   &pcc_backlight_ops);
-        if (IS_ERR(pcc->backlight))
-                goto out_input;
-
         if (!acpi_pcc_retrieve_biosdata(pcc, pcc->sinf)) {
                 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                  "Couldn't retrieve BIOS data\n"));
-                goto out_backlight;
+                goto out_input;
         }
+        /* initialize backlight */
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = pcc->sinf[SINF_AC_MAX_BRIGHT];
+        pcc->backlight = backlight_device_register("panasonic", NULL, pcc,
+                                                   &pcc_backlight_ops, &props);
+        if (IS_ERR(pcc->backlight))
+                goto out_sinf;
 
         /* read the initial brightness setting from the hardware */
-        pcc->backlight->props.max_brightness =
-                                        pcc->sinf[SINF_AC_MAX_BRIGHT];
         pcc->backlight->props.brightness = pcc->sinf[SINF_AC_CUR_BRIGHT];
 
         /* read the initial sticky key mode from the hardware */
@@ -669,12 +669,12 @@ static int acpi_pcc_hotkey_add(struct acpi_device *device)
 
 out_backlight:
         backlight_device_unregister(pcc->backlight);
+out_sinf:
+        kfree(pcc->sinf);
 out_input:
         input_unregister_device(pcc->input_dev);
         /* no need to input_free_device() since core input API refcount and
          * free()s the device */
-out_sinf:
-        kfree(pcc->sinf);
 out_hotkey:
         kfree(pcc);
 
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index 5a3d8514c66d..6553b91caaa4 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -1291,9 +1291,13 @@ static int sony_nc_add(struct acpi_device *device)
                        "controlled by ACPI video driver\n");
         } else if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "GBRT",
                                                 &handle))) {
+                                                        struct backlight_properties props;
+                memset(&props, 0, sizeof(struct backlight_properties));
+                props.max_brightness = SONY_MAX_BRIGHTNESS - 1;
                 sony_backlight_device = backlight_device_register("sony", NULL,
                                                                   NULL,
-                                                                  &sony_backlight_ops);
+                                                                  &sony_backlight_ops,
+                                                                  &props);
 
                 if (IS_ERR(sony_backlight_device)) {
                         printk(KERN_WARNING DRV_PFX "unable to register backlight device\n");
@@ -1302,8 +1306,6 @@ static int sony_nc_add(struct acpi_device *device)
                         sony_backlight_device->props.brightness =
                             sony_backlight_get_brightness
                             (sony_backlight_device);
-                        sony_backlight_device->props.max_brightness =
-                            SONY_MAX_BRIGHTNESS - 1;
                 }
 
         }
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index c64e3528889b..770b85327f84 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -6170,6 +6170,7 @@ static const struct tpacpi_quirk brightness_quirk_table[] __initconst = {
 
 static int __init brightness_init(struct ibm_init_struct *iibm)
 {
+        struct backlight_properties props;
         int b;
         unsigned long quirks;
 
@@ -6259,9 +6260,12 @@ static int __init brightness_init(struct ibm_init_struct *iibm)
                 printk(TPACPI_INFO
                        "detected a 16-level brightness capable ThinkPad\n");
 
-        ibm_backlight_device = backlight_device_register(
-                                        TPACPI_BACKLIGHT_DEV_NAME, NULL, NULL,
-                                        &ibm_backlight_data);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = (tp_features.bright_16levels) ? 15 : 7;
+        ibm_backlight_device = backlight_device_register(TPACPI_BACKLIGHT_DEV_NAME,
+                                                         NULL, NULL,
+                                                         &ibm_backlight_data,
+                                                         &props);
         if (IS_ERR(ibm_backlight_device)) {
                 int rc = PTR_ERR(ibm_backlight_device);
                 ibm_backlight_device = NULL;
@@ -6280,8 +6284,6 @@ static int __init brightness_init(struct ibm_init_struct *iibm)
                         "or not on your ThinkPad\n", TPACPI_MAIL);
         }
 
-        ibm_backlight_device->props.max_brightness =
-                                (tp_features.bright_16levels)? 15 : 7;
         ibm_backlight_device->props.brightness = b & TP_EC_BACKLIGHT_LVLMSK;
         backlight_update_status(ibm_backlight_device);
 
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 789240d1b577..def4841183be 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -924,6 +924,7 @@ static int __init toshiba_acpi_init(void)
         u32 hci_result;
         bool bt_present;
         int ret = 0;
+        struct backlight_properties props;
 
         if (acpi_disabled)
                 return -ENODEV;
@@ -974,10 +975,12 @@ static int __init toshiba_acpi_init(void)
                 }
         }
 
+        props.max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1;
         toshiba_backlight_device = backlight_device_register("toshiba",
-                                                &toshiba_acpi.p_dev->dev,
-                                                NULL,
-                                                &toshiba_backlight_data);
+                                                             &toshiba_acpi.p_dev->dev,
+                                                             NULL,
+                                                             &toshiba_backlight_data,
+                                                             &props);
         if (IS_ERR(toshiba_backlight_device)) {
                 ret = PTR_ERR(toshiba_backlight_device);
 
@@ -986,7 +989,6 @@ static int __init toshiba_acpi_init(void)
                 toshiba_acpi_exit();
                 return ret;
         }
-        toshiba_backlight_device->props.max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1;
 
         /* Register rfkill switch for Bluetooth */
         if (hci_get_bt_present(&bt_present) == HCI_SUCCESS && bt_present) {