From: Hans de Goede Date: Wed, 4 Oct 2017 18:43:37 +0000 (+0200) Subject: Bluetooth: hci_bcm: Move bcm_platform_probe call out of bcm_acpi_probe X-Git-Tag: v4.15-rc1~84^2~378^2~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=201762e21f308ec23bebe8bc0c4c033afb2879d5;p=thirdparty%2Fkernel%2Flinux.git 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: Hans de Goede Signed-off-by: Marcel Holtmann --- diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c index 73d2d88ddc039..1a9ce68b9a9b1 100644 --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c @@ -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,10 +854,13 @@ 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 - ret = bcm_platform_probe(dev); + if (ret) + return ret; + } + + ret = bcm_platform_probe(dev); if (ret) return ret;