diff options
author | Matthew Garrett <mjg@redhat.com> | 2010-02-17 16:39:44 -0500 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-03-16 15:47:54 -0400 |
commit | a19a6ee6cad2b20292a774c2f56ba8039b0fac9c (patch) | |
tree | 631916ce6181336c5c28eb0cf5484c40c92986b6 /drivers/platform/x86/toshiba_acpi.c | |
parent | 57e148b6a975980944f4466ccb669b1d02dfc6a1 (diff) |
backlight: Allow properties to be passed at registration
Values such as max_brightness should be set before backlights are
registered, but the current API doesn't allow that. Add a parameter to
backlight_device_register and update drivers to ensure that they
set this correctly.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'drivers/platform/x86/toshiba_acpi.c')
-rw-r--r-- | drivers/platform/x86/toshiba_acpi.c | 10 |
1 files changed, 6 insertions, 4 deletions
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) | |||
924 | u32 hci_result; | 924 | u32 hci_result; |
925 | bool bt_present; | 925 | bool bt_present; |
926 | int ret = 0; | 926 | int ret = 0; |
927 | struct backlight_properties props; | ||
927 | 928 | ||
928 | if (acpi_disabled) | 929 | if (acpi_disabled) |
929 | return -ENODEV; | 930 | return -ENODEV; |
@@ -974,10 +975,12 @@ static int __init toshiba_acpi_init(void) | |||
974 | } | 975 | } |
975 | } | 976 | } |
976 | 977 | ||
978 | props.max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1; | ||
977 | toshiba_backlight_device = backlight_device_register("toshiba", | 979 | toshiba_backlight_device = backlight_device_register("toshiba", |
978 | &toshiba_acpi.p_dev->dev, | 980 | &toshiba_acpi.p_dev->dev, |
979 | NULL, | 981 | NULL, |
980 | &toshiba_backlight_data); | 982 | &toshiba_backlight_data, |
983 | &props); | ||
981 | if (IS_ERR(toshiba_backlight_device)) { | 984 | if (IS_ERR(toshiba_backlight_device)) { |
982 | ret = PTR_ERR(toshiba_backlight_device); | 985 | ret = PTR_ERR(toshiba_backlight_device); |
983 | 986 | ||
@@ -986,7 +989,6 @@ static int __init toshiba_acpi_init(void) | |||
986 | toshiba_acpi_exit(); | 989 | toshiba_acpi_exit(); |
987 | return ret; | 990 | return ret; |
988 | } | 991 | } |
989 | toshiba_backlight_device->props.max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1; | ||
990 | 992 | ||
991 | /* Register rfkill switch for Bluetooth */ | 993 | /* Register rfkill switch for Bluetooth */ |
992 | if (hci_get_bt_present(&bt_present) == HCI_SUCCESS && bt_present) { | 994 | if (hci_get_bt_present(&bt_present) == HCI_SUCCESS && bt_present) { |