Commit 82e9ee61 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: ni_mio_cs: use pcmcia_request_irq()

Use pcmcia_request_irq() instead of request_irq() to request the
shared irq for the PCMCIA device. This allows the PCMCIA core to
clean up the registration in pcmcia_disable_device().
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5cd8e852
...@@ -149,8 +149,6 @@ static const struct ni_board_struct ni_boards[] = { ...@@ -149,8 +149,6 @@ static const struct ni_board_struct ni_boards[] = {
#define IRQ_POLARITY 1 #define IRQ_POLARITY 1
#define NI_E_IRQ_FLAGS IRQF_SHARED
struct ni_private { struct ni_private {
struct pcmcia_device *link; struct pcmcia_device *link;
...@@ -257,12 +255,9 @@ static int mio_cs_auto_attach(struct comedi_device *dev, ...@@ -257,12 +255,9 @@ static int mio_cs_auto_attach(struct comedi_device *dev,
return ret; return ret;
dev->iobase = link->resource[0]->start; dev->iobase = link->resource[0]->start;
if (!link->irq) link->priv = dev;
return -EINVAL; ret = pcmcia_request_irq(link, ni_E_interrupt);
if (ret)
ret = request_irq(link->irq, ni_E_interrupt, NI_E_IRQ_FLAGS,
dev->board_name, dev);
if (ret < 0)
return ret; return ret;
dev->irq = link->irq; dev->irq = link->irq;
...@@ -282,8 +277,6 @@ static int mio_cs_auto_attach(struct comedi_device *dev, ...@@ -282,8 +277,6 @@ static int mio_cs_auto_attach(struct comedi_device *dev,
static void mio_cs_detach(struct comedi_device *dev) static void mio_cs_detach(struct comedi_device *dev)
{ {
mio_common_detach(dev); mio_common_detach(dev);
if (dev->irq)
free_irq(dev->irq, dev);
comedi_pcmcia_disable(dev); comedi_pcmcia_disable(dev);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment