diff options
| author | H Hartley Sweeten | 2013-01-25 23:00:48 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-01-30 05:06:40 +0100 |
| commit | 90967d66269f20f24e8465121dadb99e51ad1f64 (patch) | |
| tree | 6053bf9c261a9379860bf53c8f8fa6cf3fdca124 /drivers/staging/comedi | |
| parent | staging: comedi: quatech_daqp_cs: remove casts of void * (diff) | |
| download | kernel-qcow2-linux-90967d66269f20f24e8465121dadb99e51ad1f64.tar.gz kernel-qcow2-linux-90967d66269f20f24e8465121dadb99e51ad1f64.tar.xz kernel-qcow2-linux-90967d66269f20f24e8465121dadb99e51ad1f64.zip | |
staging: comedi: quatech_daqp_cs: simplify IRQ_NONE checks in daqp_interrupt()
Remove all the pr_warn() noise in the sanity checks that make sure
the interrupt is for this device.
Simplify the sanity checks into one if() condition.
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>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/quatech_daqp_cs.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c index 39af1565c066..fe36450cf8cc 100644 --- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c +++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c @@ -238,37 +238,13 @@ static int daqp_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) static enum irqreturn daqp_interrupt(int irq, void *dev_id) { struct local_info_t *local = dev_id; - struct comedi_device *dev; - struct comedi_subdevice *s; + struct comedi_device *dev = local ? local->dev : NULL; + struct comedi_subdevice *s = local ? local->s : NULL; int loop_limit = 10000; int status; - if (local == NULL) { - pr_warn("irq %d for unknown device.\n", irq); - return IRQ_NONE; - } - - dev = local->dev; - if (dev == NULL) { - pr_warn("NULL comedi_device.\n"); - return IRQ_NONE; - } - - if (!dev->attached) { - pr_warn("struct comedi_device not yet attached.\n"); + if (!dev || !dev->attached || !s || s->private != local) return IRQ_NONE; - } - - s = local->s; - if (s == NULL) { - pr_warn("NULL comedi_subdevice.\n"); - return IRQ_NONE; - } - - if (s->private != local) { - pr_warn("invalid comedi_subdevice.\n"); - return IRQ_NONE; - } switch (local->interrupt_mode) { |