summaryrefslogtreecommitdiff
path: root/drivers/bluetooth/hci_bcm.c
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2017-10-04 21:43:37 +0300
committerMarcel Holtmann <marcel@holtmann.org>2017-10-06 21:35:48 +0300
commit201762e21f308ec23bebe8bc0c4c033afb2879d5 (patch)
treed2e4847b486030292da61464c70a398298634f3d /drivers/bluetooth/hci_bcm.c
parent227630cccdbb8f8a1b24ac26517b75079c9a69c9 (diff)
downloadlinux-201762e21f308ec23bebe8bc0c4c033afb2879d5.tar.xz
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 <hdegoede@redhat.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth/hci_bcm.c')
-rw-r--r--drivers/bluetooth/hci_bcm.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index 73d2d88ddc03..1a9ce68b9a9b 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;