On Wed, Sep 09, 2015 at 11:30:08AM -0600, Azael Avalos wrote:
> 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 <coproscef...@gmail.com>
...
> goto err_free_dev;
> @@ -2443,12 +2440,10 @@ static int toshiba_acpi_setup_keyboard(struct
> toshiba_acpi_dev *dev)
> * Determine hotkey query interface. Prefer using the INFO
> * method when it is available.
> */
> - if (acpi_has_method(dev->acpi_dev->handle, "INFO"))
> + if (acpi_has_method(dev->acpi_dev->handle, "INFO")) {
> dev->info_supported = 1;
> - else {
> - hci_result = hci_write(dev, HCI_SYSTEM_EVENT, 1);
> - if (hci_result == TOS_SUCCESS)
> - dev->system_event_supported = 1;
> + } else if (hci_write(dev, HCI_SYSTEM_EVENT, 1) == TOS_SUCCESS)
Ahem.
Missing the brace at the end and wreaking havoc on the poor compiler!
--
Darren Hart
Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe platform-driver-x86"
in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
