Bluetooth: hci_bcm: Switch to devm_acpi_dev_add_driver_gpios() (fda7057f) · Commits · 戴 / test

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>

drivers/bluetooth/hci_bcm.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -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;

Admin message