extcon: int3496: Switch to devm_acpi_dev_add_driver_gpios()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Sat, 10 Jun 2017 19:09:21 +0000 (22:09 +0300)
committerChanwoo Choi <cw00.choi@samsung.com>
Mon, 12 Jun 2017 01:00:24 +0000 (10:00 +0900)
Switch to use managed variant of acpi_dev_add_driver_gpios() to simplify
error path and fix potentially wrong assingment if ->probe() fails.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
drivers/extcon/extcon-intel-int3496.c

index 9d17984bbbd49a810ac749f06013c282a006c46f..d9f9afe45961df468d58273ab4725ff79b7089a5 100644 (file)
@@ -94,8 +94,7 @@ static int int3496_probe(struct platform_device *pdev)
        struct int3496_data *data;
        int ret;
 
-       ret = acpi_dev_add_driver_gpios(ACPI_COMPANION(dev),
-                                       acpi_int3496_default_gpios);
+       ret = devm_acpi_dev_add_driver_gpios(dev, acpi_int3496_default_gpios);
        if (ret) {
                dev_err(dev, "can't add GPIO ACPI mapping\n");
                return ret;
@@ -169,8 +168,6 @@ static int int3496_remove(struct platform_device *pdev)
        devm_free_irq(&pdev->dev, data->usb_id_irq, data);
        cancel_delayed_work_sync(&data->work);
 
-       acpi_dev_remove_driver_gpios(ACPI_COMPANION(&pdev->dev));
-
        return 0;
 }