redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Hans de Goede 2017-10-04 20:43:37 +02:00 committed by Marcel Holtmann
parent 227630cccd
commit 201762e21f
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/bluetooth/hci_bcm.c
View File

@ -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;