Skip to content

Commit

Permalink
staging: comedi: ni_mio_cs: use pcmcia_request_irq()
Browse files Browse the repository at this point in the history
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: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Feb 6, 2013
1 parent 5cd8e85 commit 82e9ee6
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions drivers/staging/comedi/drivers/ni_mio_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,6 @@ static const struct ni_board_struct ni_boards[] = {

#define IRQ_POLARITY 1

#define NI_E_IRQ_FLAGS IRQF_SHARED

struct ni_private {

struct pcmcia_device *link;
Expand Down Expand Up @@ -257,12 +255,9 @@ static int mio_cs_auto_attach(struct comedi_device *dev,
return ret;
dev->iobase = link->resource[0]->start;

if (!link->irq)
return -EINVAL;

ret = request_irq(link->irq, ni_E_interrupt, NI_E_IRQ_FLAGS,
dev->board_name, dev);
if (ret < 0)
link->priv = dev;
ret = pcmcia_request_irq(link, ni_E_interrupt);
if (ret)
return ret;
dev->irq = link->irq;

Expand All @@ -282,8 +277,6 @@ static int mio_cs_auto_attach(struct comedi_device *dev,
static void mio_cs_detach(struct comedi_device *dev)
{
mio_common_detach(dev);
if (dev->irq)
free_irq(dev->irq, dev);
comedi_pcmcia_disable(dev);
}

Expand Down

0 comments on commit 82e9ee6

Please sign in to comment.