The n_chan check is not needed. This value will always be >= 1. Remove
the unnecessary check.
For aesthetics, rename the function and change it's return type to void.
Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
.../staging/comedi/drivers/addi-data/hwdrv_apci3120.c | 19 +++++--------------
drivers/staging/comedi/drivers/addi_apci_3120.c | 3 +--
2 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index 28c5792..3c17246 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -96,19 +96,13 @@ This program is distributed in the hope that it will be
useful, but WITHOUT ANY
#define APCI3120_COUNTER 3
-static int apci3120_setup_chan_list(struct comedi_device *dev,
- struct comedi_subdevice *s,
- int n_chan, unsigned int *chanlist)
+static void apci3120_set_chanlist(struct comedi_device *dev,
+ struct comedi_subdevice *s,
+ int n_chan, unsigned int *chanlist)
{
struct apci3120_private *devpriv = dev->private;
int i;
- /* correct channel and range number check itself comedi/range.c */
- if (n_chan < 1) {
- dev_err(dev->class_dev, "range/channel list is empty!\n");
- return 0;
- }
-
/* set scan length (PR) and scan start (PA) */
devpriv->ctrl = APCI3120_CTRL_PR(n_chan - 1) | APCI3120_CTRL_PA(0);
outw(devpriv->ctrl, dev->iobase + APCI3120_CTRL_REG);
@@ -128,7 +122,6 @@ static int apci3120_setup_chan_list(struct comedi_device
*dev,
outw(val, dev->iobase + APCI3120_CHANLIST_REG);
}
- return 1; /* we can serve this with scan logic */
}
static int apci3120_reset(struct comedi_device *dev)
@@ -288,10 +281,8 @@ static int apci3120_cyclic_ai(int mode,
devpriv->ui_DmaActualBuffer = 0;
- /* Initializes the sequence array */
- if (!apci3120_setup_chan_list(dev, s, cmd->chanlist_len,
- cmd->chanlist))
- return -EINVAL;
+ /* load chanlist for command scan */
+ apci3120_set_chanlist(dev, s, cmd->chanlist_len, cmd->chanlist);
divisor0 = apci3120_ns_to_timer(dev, 0, cmd->convert_arg, cmd->flags);
if (mode == 2) {
diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c
b/drivers/staging/comedi/drivers/addi_apci_3120.c
index 70363fa..d40fdf2 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -310,8 +310,7 @@ static int apci3120_ai_insn_read(struct comedi_device *dev,
outb(devpriv->mode, dev->iobase + APCI3120_MODE_REG);
/* load chanlist for single channel scan */
- if (!apci3120_setup_chan_list(dev, s, 1, &insn->chanspec))
- return -EINVAL;
+ apci3120_set_chanlist(dev, s, 1, &insn->chanspec);
/*
* Timer 0 is used in MODE4 (software triggered strobe) to set the
--
2.0.3
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
