]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
usb: dwc3: pci: Switch to devm_acpi_dev_add_driver_gpios()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 22 Mar 2017 14:08:07 +0000 (16:08 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 23 Mar 2017 12:39:13 +0000 (13:39 +0100)
Switch to use managed variant of acpi_dev_add_driver_gpios() to simplify
error path and fix potentially wrong assignment if ->probe() fails.

While here, add a debug message in case assignment fails to allow user
see the cause of a potential issue.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/usb/dwc3/dwc3-pci.c

index cce0a220b6b0437f23102da3fa56f4f7373f9082..a15ec71d04233a3ac9e93fe5d9063edb0a4d89af 100644 (file)
@@ -125,8 +125,10 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc)
                if (pdev->device == PCI_DEVICE_ID_INTEL_BYT) {
                        struct gpio_desc *gpio;
 
-                       acpi_dev_add_driver_gpios(ACPI_COMPANION(&pdev->dev),
+                       ret = devm_acpi_dev_add_driver_gpios(&pdev->dev,
                                        acpi_dwc3_byt_gpios);
+                       if (ret)
+                               dev_dbg(&pdev->dev, "failed to add mapping table\n");
 
                        /*
                         * These GPIOs will turn on the USB2 PHY. Note that we have to
@@ -242,7 +244,6 @@ static void dwc3_pci_remove(struct pci_dev *pci)
 
        device_init_wakeup(&pci->dev, false);
        pm_runtime_get(&pci->dev);
-       acpi_dev_remove_driver_gpios(ACPI_COMPANION(&pci->dev));
        platform_device_unregister(dwc->dwc3);
 }