p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

toshiba_acpi: Remove unneeded u32 variables from *setup_keyboard 

The function toshiba_acpi_setup_keyboard currently has two u32 variables
used to store the Hotkey Event Type and the result of the HCI_SYSTEM_EVENT
query.

This patch removes those two variables, as we already have a global
variable named "hotkey_event_type" and the result of the HCI_SYSTEM_EVENT
query can be checked directly from the function.

Signed-off-by: Azael Avalos <coproscefalo@gmail.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
This commit is contained in:
Azael Avalos 2015-09-18 22:45:34 -06:00 committed by Darren Hart
parent 0b498201e6
commit 10e6aaabc3
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/platform/x86/toshiba_acpi.c
View File

@ -2381,8 +2381,6 @@ static int toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev)
{ {
const struct key_entry *keymap = toshiba_acpi_keymap; const struct key_entry *keymap = toshiba_acpi_keymap;
acpi_handle ec_handle; acpi_handle ec_handle;
u32 events_type;
u32 hci_result;
int error; int error;
if (wmi_has_guid(TOSHIBA_WMI_EVENT_GUID)) { if (wmi_has_guid(TOSHIBA_WMI_EVENT_GUID)) {
@ -2394,11 +2392,9 @@ static int toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev)
if (error) if (error)
return error; return error;
if (toshiba_hotkey_event_type_get(dev, &events_type)) if (toshiba_hotkey_event_type_get(dev, &dev->hotkey_event_type))
pr_notice("Unable to query Hotkey Event Type\n"); pr_notice("Unable to query Hotkey Event Type\n");
dev->hotkey_event_type = events_type;
dev->hotkey_dev = input_allocate_device(); dev->hotkey_dev = input_allocate_device();
if (!dev->hotkey_dev) if (!dev->hotkey_dev)
return -ENOMEM; return -ENOMEM;
@ -2407,14 +2403,15 @@ static int toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev)
dev->hotkey_dev->phys = "toshiba_acpi/input0"; dev->hotkey_dev->phys = "toshiba_acpi/input0";
dev->hotkey_dev->id.bustype = BUS_HOST; dev->hotkey_dev->id.bustype = BUS_HOST;
if (events_type == HCI_SYSTEM_TYPE1 || if (dev->hotkey_event_type == HCI_SYSTEM_TYPE1 ||
!dev->kbd_function_keys_supported) !dev->kbd_function_keys_supported)
keymap = toshiba_acpi_keymap; keymap = toshiba_acpi_keymap;
else if (events_type == HCI_SYSTEM_TYPE2 || else if (dev->hotkey_event_type == HCI_SYSTEM_TYPE2 ||
dev->kbd_function_keys_supported) dev->kbd_function_keys_supported)
keymap = toshiba_acpi_alt_keymap; keymap = toshiba_acpi_alt_keymap;
else else
pr_info("Unknown event type received %x\n", events_type); pr_info("Unknown event type received %x\n",
dev->hotkey_event_type);
error = sparse_keymap_setup(dev->hotkey_dev, keymap, NULL); error = sparse_keymap_setup(dev->hotkey_dev, keymap, NULL);
if (error) if (error)
goto err_free_dev; goto err_free_dev;
@ -2445,11 +2442,8 @@ static int toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev)
*/ */
if (acpi_has_method(dev->acpi_dev->handle, "INFO")) if (acpi_has_method(dev->acpi_dev->handle, "INFO"))
dev->info_supported = 1; dev->info_supported = 1;
else { else if (hci_write(dev, HCI_SYSTEM_EVENT, 1) == TOS_SUCCESS)
hci_result = hci_write(dev, HCI_SYSTEM_EVENT, 1); dev->system_event_supported = 1;
if (hci_result == TOS_SUCCESS)
dev->system_event_supported = 1;
}
if (!dev->info_supported && !dev->system_event_supported) { if (!dev->info_supported && !dev->system_event_supported) {
pr_warn("No hotkey query interface found\n"); pr_warn("No hotkey query interface found\n");