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, 5 insertions, 15 deletions

diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 021246454872..24c78ed98f07 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1563,13 +1563,6 @@ static int nsp_cs_probe(struct pcmcia_device *link)
         link->io.Attributes1     = IO_DATA_PATH_WIDTH_AUTO;
         link->io.IOAddrLines     = 10;  /* not used */
 
-        /* Interrupt setup */
-        link->irq.Attributes     = IRQ_TYPE_EXCLUSIVE;
-
-        /* Interrupt handler */
-        link->irq.Handler        = &nspintr;
-        link->irq.Attributes     |= IRQF_SHARED;
-
         /* General socket configuration */
         link->conf.Attributes    = CONF_ENABLE_IRQ;
         link->conf.IntType       = INT_MEMORY_AND_IO;
@@ -1646,8 +1639,7 @@ static int nsp_cs_config_check(struct pcmcia_device *p_dev,
                 }
 
                 /* Do we need to allocate an interrupt? */
-                if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1)
-                        p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+                p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
 
                 /* IO window settings */
                 p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
@@ -1720,10 +1712,8 @@ static int nsp_cs_config(struct pcmcia_device *link)
         if (ret)
                 goto cs_failed;
 
-        if (link->conf.Attributes & CONF_ENABLE_IRQ) {
-                if (pcmcia_request_irq(link, &link->irq))
-                        goto cs_failed;
-        }
+        if (pcmcia_request_irq(link, nspintr))
+                goto cs_failed;
 
         ret = pcmcia_request_configuration(link, &link->conf);
         if (ret)
@@ -1741,7 +1731,7 @@ static int nsp_cs_config(struct pcmcia_device *link)
         /* Set port and IRQ */
         data->BaseAddress = link->io.BasePort1;
         data->NumAddress  = link->io.NumPorts1;
-        data->IrqNumber   = link->irq.AssignedIRQ;
+        data->IrqNumber   = link->irq;
 
         nsp_dbg(NSP_DEBUG_INIT, "I/O[0x%x+0x%x] IRQ %d",
                 data->BaseAddress, data->NumAddress, data->IrqNumber);
@@ -1775,7 +1765,7 @@ static int nsp_cs_config(struct pcmcia_device *link)
                 printk(", Vpp %d.%d", link->conf.Vpp/10, link->conf.Vpp%10);
         }
         if (link->conf.Attributes & CONF_ENABLE_IRQ) {
-                printk(", irq %d", link->irq.AssignedIRQ);
+                printk(", irq %d", link->irq);
         }
         if (link->io.NumPorts1) {
                 printk(", io 0x%04x-0x%04x", link->io.BasePort1,