diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-11-04 10:54:10 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-07 09:33:59 -0800 |
| commit | ea0bb9d221d14b622dedeaa10bd5f6ac525e6efd (patch) | |
| tree | 5c7e4532416a3ab51806e4b36ab101248953633b | |
| parent | 9d5b070876ccd1f06121fa7ba5292c35a494ce24 (diff) | |
staging: comedi: addi_apci_3120: remove 'check' param from apci3120_setup_chan_list()
This parameter is always passed as '0'. Remove it and refactor the 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/addi-data/hwdrv_apci3120.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c index dd7805b7a3e4..44a3fcd19b7f 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c @@ -188,31 +188,18 @@ static int apci3120_ai_insn_config(struct comedi_device *dev, return insn->n; } -/* - * This function will first check channel list is ok or not and then - * initialize the sequence RAM with the polarity, Gain,Channel number. - * If the last argument of function "check"is 1 then it only checks - * the channel list is ok or not. - */ static int apci3120_setup_chan_list(struct comedi_device *dev, struct comedi_subdevice *s, - int n_chan, - unsigned int *chanlist, - char check) + 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) { - if (!check) - dev_err(dev->class_dev, - "range/channel list is empty!\n"); + dev_err(dev->class_dev, "range/channel list is empty!\n"); return 0; } - /* All is ok, so we can setup channel/range list */ - if (check) - return 1; /* set scan length (PR) and scan start (PA) */ devpriv->ctrl = APCI3120_CTRL_PR(n_chan - 1) | APCI3120_CTRL_PA(0); @@ -282,7 +269,7 @@ static int apci3120_ai_insn_read(struct comedi_device *dev, /* Initialize the sequence array */ if (!apci3120_setup_chan_list(dev, s, 1, - &insn->chanspec, 0)) + &insn->chanspec)) return -EINVAL; /* Initialize Timer 0 mode 4 */ @@ -347,7 +334,7 @@ static int apci3120_ai_insn_read(struct comedi_device *dev, if (!apci3120_setup_chan_list(dev, s, devpriv->ui_AiNbrofChannels, - devpriv->ui_AiChannelList, 0)) + devpriv->ui_AiChannelList)) return -EINVAL; /* Initialize Timer 0 mode 2 */ @@ -594,7 +581,7 @@ static int apci3120_cyclic_ai(int mode, /* Initializes the sequence array */ if (!apci3120_setup_chan_list(dev, s, devpriv->ui_AiNbrofChannels, - cmd->chanlist, 0)) + cmd->chanlist)) return -EINVAL; divisor0 = apci3120_ns_to_timer(dev, 0, cmd->convert_arg, cmd->flags); |