pcmcia: re-work pcmcia_request_irq()

Instead of the old pcmcia_request_irq() interface, drivers may now
choose between:

- calling request_irq/free_irq directly. Use the IRQ from *p_dev->irq.

- use pcmcia_request_irq(p_dev, handler_t); the PCMCIA core will
  clean up automatically on calls to pcmcia_disable_device() or
  device ejection.

- drivers still not capable of IRQF_SHARED (or not telling us so) may
  use the deprecated pcmcia_request_exclusive_irq() for the time
  being; they might receive a shared IRQ nonetheless.

CC: linux-bluetooth@vger.kernel.org
CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-serial@vger.kernel.org
CC: alsa-devel@alsa-project.org
CC: linux-usb@vger.kernel.org
CC: linux-ide@vger.kernel.org
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index d94b8f0bd743..2aab1e0f6633 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -268,7 +268,6 @@ static int pcmcia_init_one(struct pcmcia_device *pdev)
         pdev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
         pdev->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
         pdev->io.IOAddrLines = 3;
-        pdev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
         pdev->conf.Attributes = CONF_ENABLE_IRQ;
         pdev->conf.IntType = INT_MEMORY_AND_IO;
 
@@ -293,8 +292,7 @@ static int pcmcia_init_one(struct pcmcia_device *pdev)
         }
         io_base = pdev->io.BasePort1;
         ctl_base = stk->ctl_base;
-        ret = pcmcia_request_irq(pdev, &pdev->irq);
-        if (ret)
+        if (!pdev->irq)
                 goto failed;
 
         ret = pcmcia_request_configuration(pdev, &pdev->conf);
@@ -344,7 +342,7 @@ static int pcmcia_init_one(struct pcmcia_device *pdev)
         }
 
         /* activate */
-        ret = ata_host_activate(host, pdev->irq.AssignedIRQ, ata_sff_interrupt,
+        ret = ata_host_activate(host, pdev->irq, ata_sff_interrupt,
                                 IRQF_SHARED, &pcmcia_sht);
         if (ret)
                 goto failed;