iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform/x86: wmi: Clean up acpi_wmi_add

Browse Source 
Rearrange acpi_wmi_add to use Linux's error handling conventions.

Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Mario Limonciello <mario_limonciello@dell.com>
Cc: Pali Rohár <pali.rohar@gmail.com>
Cc: linux-kernel@vger.kernel.org
Cc: platform-driver-x86@vger.kernel.org
Cc: linux-acpi@vger.kernel.org
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
This commit is contained in:
Andy Lutomirski 2015-11-24 19:54:46 -08:00 committed by Darren Hart (VMware)
parent 7f5809bf6e
commit 46492ee4a6
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/platform/x86/wmi.c
View File

@ -803,20 +803,24 @@ static int acpi_wmi_add(struct acpi_device *device)
&acpi_wmi_ec_space_handler, &acpi_wmi_ec_space_handler,
NULL, NULL); NULL, NULL);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
pr_err("Error installing EC region handler\n"); dev_err(&device->dev, "Error installing EC region handler\n");
return -ENODEV; return -ENODEV;
} }
error = parse_wdg(device); error = parse_wdg(device);
if (error) { if (error) {
acpi_remove_address_space_handler(device->handle,
ACPI_ADR_SPACE_EC,
&acpi_wmi_ec_space_handler);
pr_err("Failed to parse WDG method\n"); pr_err("Failed to parse WDG method\n");
return error; goto err_remove_handler;
} }
return 0; return 0;
err_remove_handler:
acpi_remove_address_space_handler(device->handle,
ACPI_ADR_SPACE_EC,
&acpi_wmi_ec_space_handler);
return error;
} }
static int __init acpi_wmi_init(void) static int __init acpi_wmi_init(void)