diff options
| author |   Andy Lutomirski <luto@kernel.org> | 2015-11-24 19:54:46 -0800 |
|---|---|---|
| committer |   Darren Hart (VMware) <dvhart@infradead.org> | 2017-06-06 10:15:17 -0700 |
| commit | 46492ee4a6ca82e878218059c0f8539c8f9ac14e (patch) | |
| tree | fd12e0f14dccdbf494a65a74a3ce2ddbd5a14744 /drivers/platform/x86/wmi.c | |
| parent | platform/x86: wmi: Pass the acpi_device through to parse_wdg (diff) | |
| download | wireguard-linux-46492ee4a6ca82e878218059c0f8539c8f9ac14e.tar.xz wireguard-linux-46492ee4a6ca82e878218059c0f8539c8f9ac14e.zip | |
platform/x86: wmi: Clean up acpi_wmi_add
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>
Diffstat (limited to 'drivers/platform/x86/wmi.c')
| -rw-r--r-- | drivers/platform/x86/wmi.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index c6e11b573ef3..ac60a5119751 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -803,20 +803,24 @@ static int acpi_wmi_add(struct acpi_device *device) &acpi_wmi_ec_space_handler, NULL, NULL); if (ACPI_FAILURE(status)) { - pr_err("Error installing EC region handler\n"); + dev_err(&device->dev, "Error installing EC region handler\n"); return -ENODEV; } error = parse_wdg(device); 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"); - return error; + goto err_remove_handler; } 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) |