diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-09-09 16:15:59 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-11 14:35:21 -0700 |
| commit | 1e2e39effd11ca7c09cc47aff9e99d976109bbe8 (patch) | |
| tree | 33f15c87114356d794243ba2b93a90b5c3dc7081 | |
| parent | 8e7fed7ed760275c3e8e73e4328751fcb8f21642 (diff) | |
staging: comedi: pcmuio: return void from pcmuio_start_intr()
This function always returns '0' so the comedi_event() is never done by the
callers.
Change the return type to void and remove the comedi_event() dead code.
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/pcmuio.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c index a0d31718a096..d4fe2ec25ecf 100644 --- a/drivers/staging/comedi/drivers/pcmuio.c +++ b/drivers/staging/comedi/drivers/pcmuio.c @@ -403,8 +403,8 @@ static irqreturn_t pcmuio_interrupt(int irq, void *d) } /* chip->spinlock is already locked */ -static int pcmuio_start_intr(struct comedi_device *dev, - struct comedi_subdevice *s) +static void pcmuio_start_intr(struct comedi_device *dev, + struct comedi_subdevice *s) { struct pcmuio_private *devpriv = dev->private; int asic = pcmuio_subdevice_to_asic(s); @@ -433,8 +433,6 @@ static int pcmuio_start_intr(struct comedi_device *dev, /* set pol and enab intrs for this subdev.. */ pcmuio_write(dev, pol_bits, asic, PCMUIO_PAGE_POL, 0); pcmuio_write(dev, bits, asic, PCMUIO_PAGE_ENAB, 0); - - return 0; } static int pcmuio_cancel(struct comedi_device *dev, struct comedi_subdevice *s) @@ -461,7 +459,6 @@ static int pcmuio_inttrig_start_intr(struct comedi_device *dev, int asic = pcmuio_subdevice_to_asic(s); struct pcmuio_asic *chip = &devpriv->asics[asic]; unsigned long flags; - int event = 0; if (trig_num != cmd->start_arg) return -EINVAL; @@ -469,13 +466,10 @@ static int pcmuio_inttrig_start_intr(struct comedi_device *dev, spin_lock_irqsave(&chip->spinlock, flags); s->async->inttrig = NULL; if (chip->active) - event = pcmuio_start_intr(dev, s); + pcmuio_start_intr(dev, s); spin_unlock_irqrestore(&chip->spinlock, flags); - if (event) - comedi_event(dev, s); - return 1; } @@ -489,7 +483,6 @@ static int pcmuio_cmd(struct comedi_device *dev, struct comedi_subdevice *s) int asic = pcmuio_subdevice_to_asic(s); struct pcmuio_asic *chip = &devpriv->asics[asic]; unsigned long flags; - int event = 0; spin_lock_irqsave(&chip->spinlock, flags); chip->active = 1; @@ -500,13 +493,10 @@ static int pcmuio_cmd(struct comedi_device *dev, struct comedi_subdevice *s) if (cmd->start_src == TRIG_INT) s->async->inttrig = pcmuio_inttrig_start_intr; else /* TRIG_NOW */ - event = pcmuio_start_intr(dev, s); + pcmuio_start_intr(dev, s); spin_unlock_irqrestore(&chip->spinlock, flags); - if (event) - comedi_event(dev, s); - return 0; } |