evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: ni_atmio16d: tidy up the irq support in atmio16d_attach()

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

Only hookup the commad support if the irq was sucessfully requested.

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:30 -07:00 • committed by Greg Kroah-Hartman
parent d4bdba2f60
commit ec9b2f4f4f
1 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
drivers/staging/comedi/drivers/ni_atmio16d.c
View file

@ -631,7 +631,6 @@ static int atmio16d_attach(struct comedi_device *dev,
const struct atmio16_board_t *board = comedi_board(dev); const struct atmio16_board_t *board = comedi_board(dev);
struct atmio16d_private *devpriv; struct atmio16d_private *devpriv;
struct comedi_subdevice *s; struct comedi_subdevice *s;
unsigned int irq;
int ret; int ret;
ret = comedi_request_region(dev, it->options[0], ATMIO16D_SIZE); ret = comedi_request_region(dev, it->options[0], ATMIO16D_SIZE);
@ -649,19 +648,11 @@ static int atmio16d_attach(struct comedi_device *dev,
/* reset the atmio16d hardware */ /* reset the atmio16d hardware */
reset_atmio16d(dev); reset_atmio16d(dev);
/* check if our interrupt is available and get it */ if (it->options[1]) {
irq = it->options[1]; ret = request_irq(it->options[1], atmio16d_interrupt, 0,
if (irq) { dev->board_name, dev);
if (ret == 0)
ret = request_irq(irq, atmio16d_interrupt, 0, "atmio16d", dev); dev->irq = it->options[1];
if (ret < 0) {
printk(KERN_INFO "failed to allocate irq %u\n", irq);
return ret;
}
dev->irq = irq;
printk(KERN_INFO "( irq = %u )\n", irq);
} else {
printk(KERN_INFO "( no irq )");
} }
/* set device options */ /* set device options */
@ -677,16 +668,11 @@ static int atmio16d_attach(struct comedi_device *dev,
/* setup sub-devices */ /* setup sub-devices */
s = &dev->subdevices[0]; s = &dev->subdevices[0];
dev->read_subdev = s;
/* ai subdevice */ /* ai subdevice */
s->type = COMEDI_SUBD_AI; s->type = COMEDI_SUBD_AI;
s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_CMD_READ; s->subdev_flags = SDF_READABLE | SDF_GROUND;
s->n_chan = (devpriv->adc_mux ? 16 : 8); s->n_chan = (devpriv->adc_mux ? 16 : 8);
s->len_chanlist = 16;
s->insn_read = atmio16d_ai_insn_read; s->insn_read = atmio16d_ai_insn_read;
s->do_cmdtest = atmio16d_ai_cmdtest;
s->do_cmd = atmio16d_ai_cmd;
s->cancel = atmio16d_ai_cancel;
s->maxdata = 0xfff; /* 4095 decimal */ s->maxdata = 0xfff; /* 4095 decimal */
switch (devpriv->adc_range) { switch (devpriv->adc_range) {
case adc_bipolar10: case adc_bipolar10:
@ -699,6 +685,14 @@ static int atmio16d_attach(struct comedi_device *dev,
s->range_table = &range_atmio16d_ai_unipolar; s->range_table = &range_atmio16d_ai_unipolar;
break; break;
} }
if (dev->irq) {
dev->read_subdev = s;
s->subdev_flags |= SDF_CMD_READ;
s->len_chanlist = 16;
s->do_cmdtest = atmio16d_ai_cmdtest;
s->do_cmd = atmio16d_ai_cmd;
s->cancel = atmio16d_ai_cancel;
}
/* ao subdevice */ /* ao subdevice */
s = &dev->subdevices[1]; s = &dev->subdevices[1];