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>

diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index c6e11b573ef3a6318f1610f222ec1c5d6237ec1e..ac60a5119751a50bbee5228897f6cbd6fe82f705 100644 (file)
--- 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)