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

Commit 201762e2 authored by Hans de Goede's avatar Hans de Goede Committed by Marcel Holtmann
Browse files

Bluetooth: hci_bcm: Move bcm_platform_probe call out of bcm_acpi_probe 



Since bcm_acpi_probe calls bcm_platform_probe, bcm_probe always ends up
calling bcm_platform_probe.

This commit simplifies things by making bcm_probe always call
bcm_platform_probe itself.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 227630cc

drivers/bluetooth/hci_bcm.c

+6 −7
Original line number Diff line number Diff line
@@ -820,10 +820,6 @@ static int bcm_acpi_probe(struct bcm_device *dev) 
	if (ret)

		return ret;



	ret = bcm_platform_probe(dev);

	if (ret)

		return ret;



	/* Retrieve UART ACPI info */

	ret = acpi_dev_get_resources(ACPI_COMPANION(&dev->pdev->dev),

				     &resources, bcm_resource, dev);
@@ -858,9 +854,12 @@ static int bcm_probe(struct platform_device *pdev) 


	dev->pdev = pdev;



	if (has_acpi_companion(&pdev->dev))

	if (has_acpi_companion(&pdev->dev)) {

		ret = bcm_acpi_probe(dev);

	else

		if (ret)

			return ret;

	}



	ret = bcm_platform_probe(dev);

	if (ret)

		return ret;