iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: comedi: pcl818: tidy up the irq support in pcl818_attach()

Browse Source 
Tidy up the code that does the request_irq().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-11-26 16:42:18 -07:00 committed by Greg Kroah-Hartman
parent eeb6f2d3b7
commit e30b22a9cc
1 changed files with 7 additions and 21 deletions

28
drivers/staging/comedi/drivers/pcl818.c

@ -1204,7 +1204,6 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
const struct pcl818_board *board = comedi_board(dev); const struct pcl818_board *board = comedi_board(dev);
struct pcl818_private *devpriv; struct pcl818_private *devpriv;
int ret; int ret;
unsigned int irq;
int dma; int dma;
unsigned long pages; unsigned long pages;
struct comedi_subdevice *s; struct comedi_subdevice *s;
@ -1228,28 +1227,15 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return -EIO; return -EIO;
} }
/* grab our IRQ */ if ((1 << it->options[1]) & board->IRQbits) {
irq = 0; ret = request_irq(it->options[1], interrupt_pcl818, 0,
if (board->IRQbits != 0) { /* board support IRQ */ dev->board_name, dev);
irq = it->options[1]; if (ret == 0) {
if (irq) { /* we want to use IRQ */ dev->irq = it->options[1];
if (((1 << irq) & board->IRQbits) == 0) { devpriv->irq_free = 1;
irq = 0; /* Bad IRQ */
} else {
if (request_irq(irq, interrupt_pcl818, 0,
dev->board_name, dev)) {
irq = 0; /* Can't use IRQ */
}
}
} }
} }
dev->irq = irq;
if (irq)
devpriv->irq_free = 1; /* 1=we have allocated irq */
else
devpriv->irq_free = 0;
devpriv->irq_blocked = 0; /* number of subdevice which use IRQ */ devpriv->irq_blocked = 0; /* number of subdevice which use IRQ */
devpriv->ai_mode = 0; /* mode of irq */ devpriv->ai_mode = 0; /* mode of irq */
@ -1311,7 +1297,7 @@ no_dma:
s->range_table = board->ai_range_type; s->range_table = board->ai_range_type;
s->cancel = pcl818_ai_cancel; s->cancel = pcl818_ai_cancel;
s->insn_read = pcl818_ai_insn_read; s->insn_read = pcl818_ai_insn_read;
if (irq) { if (dev->irq) {
dev->read_subdev = s; dev->read_subdev = s;
s->subdev_flags |= SDF_CMD_READ; s->subdev_flags |= SDF_CMD_READ;
s->do_cmdtest = ai_cmdtest; s->do_cmdtest = ai_cmdtest;