summaryrefslogtreecommitdiff
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2017-10-04 20:43:38 +0200
committerMarcel Holtmann <marcel@holtmann.org>2017-10-06 20:35:48 +0200
commit4a56f891efceee88d422af2e99d00c8321c671c1 (patch)
tree911dcf77650efaa1adad158a2a78b501d3c543fb /drivers/bluetooth
parent201762e21f308ec23bebe8bc0c4c033afb2879d5 (diff)
Bluetooth: hci_bcm: Move platform_get_irq call to bcm_probe
The ACPI subsys is going to move over to instantiating ACPI enumerated HCIs as serdevs, rather then as platform devices. Most of the code in bcm_platform_probe is actually not platform specific and will work with any struct device passed to it, the one platform specific call in bcm_platform_probe is platform_get_irq. This commit moves platform_get_irq call to the platform-driver's bcm_probe function, this is a preparation patch for adding (runtime)pm support to the serdev path. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/hci_bcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index 1a9ce68b9a9b..3cbd7dab112a 100644
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -776,7 +776,6 @@ static int bcm_platform_probe(struct bcm_device *dev)
return PTR_ERR(dev->shutdown);
/* IRQ can be declared in ACPI table as Interrupt or GpioInt */
- dev->irq = platform_get_irq(pdev, 0);
if (dev->irq <= 0) {
struct gpio_desc *gpio;
@@ -853,6 +852,7 @@ static int bcm_probe(struct platform_device *pdev)
return -ENOMEM;
dev->pdev = pdev;
+ dev->irq = platform_get_irq(pdev, 0);
if (has_acpi_companion(&pdev->dev)) {
ret = bcm_acpi_probe(dev);