Merge branch 'acpi-assorted'

* acpi-assorted:
  ACPI: Add Toshiba NB100 to Vista _OSI blacklist
  ACPI / osl: remove an unneeded NULL check
  ACPI / platform: add ACPI ID for a Broadcom GPS chip
  ACPI: improve acpi_extract_package() utility
  ACPI / LPSS: fix UART Auto Flow Control
  ACPI / platform: Add ACPI IDs for Intel SST audio device
  x86 / ACPI: fix incorrect placement of __initdata tag
  ACPI / thermal: convert printk(LEVEL...) to pr_<lvl>
  ACPI / sysfs: make GPE sysfs attributes only accept correct values
  ACPI / EC: Convert all printk() calls to dynamic debug function
  ACPI / button: Using input_set_capability() to mark device's event capability
  ACPI / osl: implement acpi_os_sleep() with msleep()

1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index a55773801c5f..c971929d75c2 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -383,18 +383,15 @@ static int acpi_button_add(struct acpi_device *device)
 
         switch (button->type) {
         case ACPI_BUTTON_TYPE_POWER:
-                input->evbit[0] = BIT_MASK(EV_KEY);
-                set_bit(KEY_POWER, input->keybit);
+                input_set_capability(input, EV_KEY, KEY_POWER);
                 break;
 
         case ACPI_BUTTON_TYPE_SLEEP:
-                input->evbit[0] = BIT_MASK(EV_KEY);
-                set_bit(KEY_SLEEP, input->keybit);
+                input_set_capability(input, EV_KEY, KEY_SLEEP);
                 break;
 
         case ACPI_BUTTON_TYPE_LID:
-                input->evbit[0] = BIT_MASK(EV_SW);
-                set_bit(SW_LID, input->swbit);
+                input_set_capability(input, EV_SW, SW_LID);
                 break;
         }