1 files changed, 1 insertions, 5 deletions

diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c
index d9b651ffcdc0..faf8a5232d8e 100644
--- a/drivers/acpi/toshiba_acpi.c
+++ b/drivers/acpi/toshiba_acpi.c
@@ -125,7 +125,7 @@ static int write_acpi_int(const char *methodName, int val)
         union acpi_object in_objs[1];
         acpi_status status;
 
-        params.count = sizeof(in_objs) / sizeof(in_objs[0]);
+        params.count = ARRAY_SIZE(in_objs);
         params.pointer = in_objs;
         in_objs[0].type = ACPI_TYPE_INTEGER;
         in_objs[0].integer.value = val;
@@ -561,10 +561,6 @@ static int __init toshiba_acpi_init(void)
         if (acpi_disabled)
                 return -ENODEV;
 
-        if (!acpi_specific_hotkey_enabled) {
-                printk(MY_INFO "Using generic hotkey driver\n");
-                return -ENODEV;
-        }
         /* simple device detection: look for HCI method */
         if (is_valid_acpi_path(METHOD_HCI_1))
                 method_hci = METHOD_HCI_1;