hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-02-05 18:16:53 -07:00 committed by Greg Kroah-Hartman
parent 5cd8e85262
commit 82e9ee616a
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/comedi/drivers/ni_mio_cs.c
View File

@ -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,
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,
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);
} }