Bluetooth: hci_bcm: Switch to devm_acpi_dev_add_driver_gpios()

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: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index f87bfdfee4ff5adab798167929650f14f978931a..e2096c7803b36c9d6f43fd32c3829c3414566659 100644 (file)
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -762,8 +762,7 @@ static int bcm_acpi_probe(struct bcm_device *dev)
        if (id)
                gpio_mapping = (const struct acpi_gpio_mapping *) id->driver_data;
 
-       ret = acpi_dev_add_driver_gpios(ACPI_COMPANION(&pdev->dev),
-                                       gpio_mapping);
+       ret = devm_acpi_dev_add_driver_gpios(&pdev->dev, gpio_mapping);
        if (ret)
                return ret;
 
@@ -834,8 +833,6 @@ static int bcm_remove(struct platform_device *pdev)
        list_del(&dev->list);
        mutex_unlock(&bcm_device_lock);
 
-       acpi_dev_remove_driver_gpios(ACPI_COMPANION(&pdev->dev));
-
        dev_info(&pdev->dev, "%s device unregistered.\n", dev->name);
 
        return 0;