diff options
| author | H Hartley Sweeten | 2014-09-10 01:15:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-09-11 23:35:20 +0200 |
| commit | 157a340d1ff490c346e6ea02eaa21510432ac092 (patch) | |
| tree | c27a0d262cbf456524834f493f351e0f990a69e5 /drivers/staging/comedi | |
| parent | staging: comedi: amplc_dio200_common: 'stopcount' is always 'stop_arg' (diff) | |
| download | kernel-qcow2-linux-157a340d1ff490c346e6ea02eaa21510432ac092.tar.gz kernel-qcow2-linux-157a340d1ff490c346e6ea02eaa21510432ac092.tar.xz kernel-qcow2-linux-157a340d1ff490c346e6ea02eaa21510432ac092.zip | |
staging: comedi: amplc_dio200_common: return void from dio200_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>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/amplc_dio200_common.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/drivers/staging/comedi/drivers/amplc_dio200_common.c b/drivers/staging/comedi/drivers/amplc_dio200_common.c index 107e45a89771..4cf0714db4c0 100644 --- a/drivers/staging/comedi/drivers/amplc_dio200_common.c +++ b/drivers/staging/comedi/drivers/amplc_dio200_common.c @@ -209,8 +209,8 @@ static void dio200_stop_intr(struct comedi_device *dev, dio200_write8(dev, subpriv->ofs, 0); } -static int dio200_start_intr(struct comedi_device *dev, - struct comedi_subdevice *s) +static void dio200_start_intr(struct comedi_device *dev, + struct comedi_subdevice *s) { const struct dio200_board *board = comedi_board(dev); struct dio200_subdev_intr *subpriv = s->private; @@ -229,8 +229,6 @@ static int dio200_start_intr(struct comedi_device *dev, subpriv->enabled_isns = isn_bits; if (board->has_int_sce) dio200_write8(dev, subpriv->ofs, isn_bits); - - return 0; } static int dio200_inttrig_start_intr(struct comedi_device *dev, @@ -240,7 +238,6 @@ static int dio200_inttrig_start_intr(struct comedi_device *dev, struct dio200_subdev_intr *subpriv = s->private; struct comedi_cmd *cmd = &s->async->cmd; unsigned long flags; - int event = 0; if (trig_num != cmd->start_arg) return -EINVAL; @@ -248,13 +245,10 @@ static int dio200_inttrig_start_intr(struct comedi_device *dev, spin_lock_irqsave(&subpriv->spinlock, flags); s->async->inttrig = NULL; if (subpriv->active) - event = dio200_start_intr(dev, s); + dio200_start_intr(dev, s); spin_unlock_irqrestore(&subpriv->spinlock, flags); - if (event) - comedi_event(dev, s); - return 1; } @@ -438,7 +432,6 @@ static int dio200_subdev_intr_cmd(struct comedi_device *dev, struct comedi_cmd *cmd = &s->async->cmd; struct dio200_subdev_intr *subpriv = s->private; unsigned long flags; - int event = 0; spin_lock_irqsave(&subpriv->spinlock, flags); @@ -448,13 +441,10 @@ static int dio200_subdev_intr_cmd(struct comedi_device *dev, if (cmd->start_src == TRIG_INT) s->async->inttrig = dio200_inttrig_start_intr; else /* TRIG_NOW */ - event = dio200_start_intr(dev, s); + dio200_start_intr(dev, s); spin_unlock_irqrestore(&subpriv->spinlock, flags); - if (event) - comedi_event(dev, s); - return 0; } |