diff options
author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2007-04-24 10:48:20 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-04-25 02:00:27 -0400 |
commit | 7d5a015eece8be9186d3613d595643a520555e33 (patch) | |
tree | 7ce09f4b768e2d471daa6a26ef7336965972004f /drivers | |
parent | b616004c70dd7f60a1477c3e9d6fddd00ee1fa37 (diff) |
ACPI: thinkpad-acpi: update brightness sysfs interface support
Update the brightness sysfs interface (done through the backlight class) to
be in line with the rest of the thinkpad-acpi driver.
This renames the incorrect, un-obvious, and clash-prone name of "ibm" for
the backlight device to a much more fitting and descriptive
"thinkpad_screen". This is something I wanted to do for quite a while...
Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/misc/thinkpad_acpi.c | 5 | ||||
-rw-r--r-- | drivers/misc/thinkpad_acpi.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c index ba749df189ab..c0a023cc5ded 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/misc/thinkpad_acpi.c | |||
@@ -2414,8 +2414,9 @@ static int __init brightness_init(struct ibm_init_struct *iibm) | |||
2414 | if (b < 0) | 2414 | if (b < 0) |
2415 | return b; | 2415 | return b; |
2416 | 2416 | ||
2417 | ibm_backlight_device = backlight_device_register("ibm", NULL, NULL, | 2417 | ibm_backlight_device = backlight_device_register( |
2418 | &ibm_backlight_data); | 2418 | TPACPI_BACKLIGHT_DEV_NAME, NULL, NULL, |
2419 | &ibm_backlight_data); | ||
2419 | if (IS_ERR(ibm_backlight_device)) { | 2420 | if (IS_ERR(ibm_backlight_device)) { |
2420 | printk(IBM_ERR "Could not register backlight device\n"); | 2421 | printk(IBM_ERR "Could not register backlight device\n"); |
2421 | return PTR_ERR(ibm_backlight_device); | 2422 | return PTR_ERR(ibm_backlight_device); |
diff --git a/drivers/misc/thinkpad_acpi.h b/drivers/misc/thinkpad_acpi.h index 2fe4d61cc27f..8348fc653009 100644 --- a/drivers/misc/thinkpad_acpi.h +++ b/drivers/misc/thinkpad_acpi.h | |||
@@ -296,6 +296,8 @@ static int bluetooth_write(char *buf); | |||
296 | * Brightness (backlight) subdriver | 296 | * Brightness (backlight) subdriver |
297 | */ | 297 | */ |
298 | 298 | ||
299 | #define TPACPI_BACKLIGHT_DEV_NAME "thinkpad_screen" | ||
300 | |||
299 | static struct backlight_device *ibm_backlight_device; | 301 | static struct backlight_device *ibm_backlight_device; |
300 | static int brightness_offset = 0x31; | 302 | static int brightness_offset = 0x31; |
301 | 303 | ||