diff options
| -rw-r--r-- | drivers/platform/x86/toshiba_acpi.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index c08c12f4c182..46473ca7566b 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c | |||
| @@ -78,7 +78,7 @@ MODULE_LICENSE("GPL"); | |||
| 78 | * However the ACPI methods seem to be incomplete in some areas (for | 78 | * However the ACPI methods seem to be incomplete in some areas (for |
| 79 | * example they allow setting, but not reading, the LCD brightness value), | 79 | * example they allow setting, but not reading, the LCD brightness value), |
| 80 | * so this is still useful. | 80 | * so this is still useful. |
| 81 | * | 81 | * |
| 82 | * SCI stands for "System Configuration Interface" which aim is to | 82 | * SCI stands for "System Configuration Interface" which aim is to |
| 83 | * conceal differences in hardware between different models. | 83 | * conceal differences in hardware between different models. |
| 84 | */ | 84 | */ |
| @@ -456,7 +456,7 @@ static enum led_brightness toshiba_illumination_get(struct led_classdev *cdev) | |||
| 456 | 456 | ||
| 457 | return state ? LED_FULL : LED_OFF; | 457 | return state ? LED_FULL : LED_OFF; |
| 458 | } | 458 | } |
| 459 | 459 | ||
| 460 | /* KBD Illumination */ | 460 | /* KBD Illumination */ |
| 461 | static int toshiba_kbd_illum_status_set(struct toshiba_acpi_dev *dev, u32 time) | 461 | static int toshiba_kbd_illum_status_set(struct toshiba_acpi_dev *dev, u32 time) |
| 462 | { | 462 | { |
| @@ -539,7 +539,7 @@ static void toshiba_kbd_backlight_set(struct led_classdev *cdev, | |||
| 539 | return; | 539 | return; |
| 540 | } | 540 | } |
| 541 | } | 541 | } |
| 542 | 542 | ||
| 543 | /* TouchPad support */ | 543 | /* TouchPad support */ |
| 544 | static int toshiba_touchpad_set(struct toshiba_acpi_dev *dev, u32 state) | 544 | static int toshiba_touchpad_set(struct toshiba_acpi_dev *dev, u32 state) |
| 545 | { | 545 | { |
| @@ -631,7 +631,7 @@ static void toshiba_eco_mode_set_status(struct led_classdev *cdev, | |||
| 631 | return; | 631 | return; |
| 632 | } | 632 | } |
| 633 | } | 633 | } |
| 634 | 634 | ||
| 635 | /* Accelerometer support */ | 635 | /* Accelerometer support */ |
| 636 | static int toshiba_accelerometer_supported(struct toshiba_acpi_dev *dev) | 636 | static int toshiba_accelerometer_supported(struct toshiba_acpi_dev *dev) |
| 637 | { | 637 | { |
| @@ -1200,7 +1200,7 @@ static const struct backlight_ops toshiba_backlight_data = { | |||
| 1200 | .get_brightness = get_lcd_brightness, | 1200 | .get_brightness = get_lcd_brightness, |
| 1201 | .update_status = set_lcd_status, | 1201 | .update_status = set_lcd_status, |
| 1202 | }; | 1202 | }; |
| 1203 | 1203 | ||
| 1204 | /* | 1204 | /* |
| 1205 | * Sysfs files | 1205 | * Sysfs files |
| 1206 | */ | 1206 | */ |
| @@ -1280,7 +1280,7 @@ static ssize_t toshiba_kbd_bl_timeout_show(struct device *dev, | |||
| 1280 | 1280 | ||
| 1281 | return sprintf(buf, "%i\n", time >> HCI_MISC_SHIFT); | 1281 | return sprintf(buf, "%i\n", time >> HCI_MISC_SHIFT); |
| 1282 | } | 1282 | } |
| 1283 | 1283 | ||
| 1284 | static ssize_t toshiba_touchpad_store(struct device *dev, | 1284 | static ssize_t toshiba_touchpad_store(struct device *dev, |
| 1285 | struct device_attribute *attr, | 1285 | struct device_attribute *attr, |
| 1286 | const char *buf, size_t count) | 1286 | const char *buf, size_t count) |
| @@ -1310,7 +1310,7 @@ static ssize_t toshiba_touchpad_show(struct device *dev, | |||
| 1310 | 1310 | ||
| 1311 | return sprintf(buf, "%i\n", state); | 1311 | return sprintf(buf, "%i\n", state); |
| 1312 | } | 1312 | } |
| 1313 | 1313 | ||
| 1314 | static ssize_t toshiba_position_show(struct device *dev, | 1314 | static ssize_t toshiba_position_show(struct device *dev, |
| 1315 | struct device_attribute *attr, char *buf) | 1315 | struct device_attribute *attr, char *buf) |
| 1316 | { | 1316 | { |
| @@ -1573,7 +1573,7 @@ static int toshiba_acpi_remove(struct acpi_device *acpi_dev) | |||
| 1573 | struct toshiba_acpi_dev *dev = acpi_driver_data(acpi_dev); | 1573 | struct toshiba_acpi_dev *dev = acpi_driver_data(acpi_dev); |
| 1574 | 1574 | ||
| 1575 | remove_toshiba_proc_entries(dev); | 1575 | remove_toshiba_proc_entries(dev); |
| 1576 | 1576 | ||
| 1577 | if (dev->sysfs_created) | 1577 | if (dev->sysfs_created) |
| 1578 | sysfs_remove_group(&dev->acpi_dev->dev.kobj, | 1578 | sysfs_remove_group(&dev->acpi_dev->dev.kobj, |
| 1579 | &toshiba_attr_group); | 1579 | &toshiba_attr_group); |
| @@ -1598,10 +1598,10 @@ static int toshiba_acpi_remove(struct acpi_device *acpi_dev) | |||
| 1598 | 1598 | ||
| 1599 | if (dev->illumination_supported) | 1599 | if (dev->illumination_supported) |
| 1600 | led_classdev_unregister(&dev->led_dev); | 1600 | led_classdev_unregister(&dev->led_dev); |
| 1601 | 1601 | ||
| 1602 | if (dev->kbd_led_registered) | 1602 | if (dev->kbd_led_registered) |
| 1603 | led_classdev_unregister(&dev->kbd_led); | 1603 | led_classdev_unregister(&dev->kbd_led); |
| 1604 | 1604 | ||
| 1605 | if (dev->eco_supported) | 1605 | if (dev->eco_supported) |
| 1606 | led_classdev_unregister(&dev->eco_led); | 1606 | led_classdev_unregister(&dev->eco_led); |
| 1607 | 1607 | ||
| @@ -1690,7 +1690,7 @@ static int toshiba_acpi_add(struct acpi_device *acpi_dev) | |||
| 1690 | if (!led_classdev_register(&acpi_dev->dev, &dev->led_dev)) | 1690 | if (!led_classdev_register(&acpi_dev->dev, &dev->led_dev)) |
| 1691 | dev->illumination_supported = 1; | 1691 | dev->illumination_supported = 1; |
| 1692 | } | 1692 | } |
| 1693 | 1693 | ||
| 1694 | if (toshiba_eco_mode_available(dev)) { | 1694 | if (toshiba_eco_mode_available(dev)) { |
| 1695 | dev->eco_led.name = "toshiba::eco_mode"; | 1695 | dev->eco_led.name = "toshiba::eco_mode"; |
| 1696 | dev->eco_led.max_brightness = 1; | 1696 | dev->eco_led.max_brightness = 1; |
| @@ -1699,7 +1699,7 @@ static int toshiba_acpi_add(struct acpi_device *acpi_dev) | |||
| 1699 | if (!led_classdev_register(&dev->acpi_dev->dev, &dev->eco_led)) | 1699 | if (!led_classdev_register(&dev->acpi_dev->dev, &dev->eco_led)) |
| 1700 | dev->eco_supported = 1; | 1700 | dev->eco_supported = 1; |
| 1701 | } | 1701 | } |
| 1702 | 1702 | ||
| 1703 | ret = toshiba_kbd_illum_status_get(dev, &dummy); | 1703 | ret = toshiba_kbd_illum_status_get(dev, &dummy); |
| 1704 | if (!ret) { | 1704 | if (!ret) { |
| 1705 | dev->kbd_time = dummy >> HCI_MISC_SHIFT; | 1705 | dev->kbd_time = dummy >> HCI_MISC_SHIFT; |
| @@ -1718,10 +1718,10 @@ static int toshiba_acpi_add(struct acpi_device *acpi_dev) | |||
| 1718 | if (!led_classdev_register(&dev->acpi_dev->dev, &dev->kbd_led)) | 1718 | if (!led_classdev_register(&dev->acpi_dev->dev, &dev->kbd_led)) |
| 1719 | dev->kbd_led_registered = 1; | 1719 | dev->kbd_led_registered = 1; |
| 1720 | } | 1720 | } |
| 1721 | 1721 | ||
| 1722 | ret = toshiba_touchpad_get(dev, &dummy); | 1722 | ret = toshiba_touchpad_get(dev, &dummy); |
| 1723 | dev->touchpad_supported = !ret; | 1723 | dev->touchpad_supported = !ret; |
| 1724 | 1724 | ||
| 1725 | ret = toshiba_accelerometer_supported(dev); | 1725 | ret = toshiba_accelerometer_supported(dev); |
| 1726 | dev->accelerometer_supported = !ret; | 1726 | dev->accelerometer_supported = !ret; |
| 1727 | 1727 | ||
