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>
This commit is contained in:
parent
201762e21f
commit
4a56f891ef
drivers/bluetooth
|
@ -776,7 +776,6 @@ static int bcm_platform_probe(struct bcm_device *dev)
|
||||||
return PTR_ERR(dev->shutdown);
|
return PTR_ERR(dev->shutdown);
|
||||||
|
|
||||||
/* IRQ can be declared in ACPI table as Interrupt or GpioInt */
|
/* IRQ can be declared in ACPI table as Interrupt or GpioInt */
|
||||||
dev->irq = platform_get_irq(pdev, 0);
|
|
||||||
if (dev->irq <= 0) {
|
if (dev->irq <= 0) {
|
||||||
struct gpio_desc *gpio;
|
struct gpio_desc *gpio;
|
||||||
|
|
||||||
|
@ -853,6 +852,7 @@ static int bcm_probe(struct platform_device *pdev)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
dev->pdev = pdev;
|
dev->pdev = pdev;
|
||||||
|
dev->irq = platform_get_irq(pdev, 0);
|
||||||
|
|
||||||
if (has_acpi_companion(&pdev->dev)) {
|
if (has_acpi_companion(&pdev->dev)) {
|
||||||
ret = bcm_acpi_probe(dev);
|
ret = bcm_acpi_probe(dev);
|
||||||
|
|
Loading…
Reference in New Issue