Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a56e413 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Walleij
Browse files

usb: dwc3: pci: 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 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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 96530b37

drivers/usb/dwc3/dwc3-pci.c

+3 −2
Original line number Diff line number Diff line
@@ -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);

}