summaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi
diff options
context:
space:
mode:
authorH Hartley Sweeten2014-09-09 22:05:43 +0200
committerGreg Kroah-Hartman2014-09-11 23:34:25 +0200
commitacdc21c2030659de8d9a9d3960b3b004a38eeec7 (patch)
tree9608f16358e3581f19758ee9029be46be905073c /drivers/staging/comedi
parentstaging: comedi: adl_pci9118: merge pci9118_exttrg_{add,del}() (diff)
downloadkernel-qcow2-linux-acdc21c2030659de8d9a9d3960b3b004a38eeec7.tar.gz
kernel-qcow2-linux-acdc21c2030659de8d9a9d3960b3b004a38eeec7.tar.xz
kernel-qcow2-linux-acdc21c2030659de8d9a9d3960b3b004a38eeec7.zip
staging: comedi: adl_pci9118: remove unused parameters from setup_channel_list()
The 'rot' and 'usedma' parameters are not used in this function. Remove them. 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/adl_pci9118.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index 319ec1aa91c4..67f8ff14efa8 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -387,18 +387,13 @@ static int check_channel_list(struct comedi_device *dev,
static int setup_channel_list(struct comedi_device *dev,
struct comedi_subdevice *s, int n_chan,
- unsigned int *chanlist, int rot, int frontadd,
- int backadd, int usedma)
+ unsigned int *chanlist, int frontadd,
+ int backadd)
{
struct pci9118_private *devpriv = dev->private;
unsigned int scanquad, gain, ssh = 0x00;
int i;
- if (usedma == 1) {
- rot = 8;
- usedma = 0;
- }
-
/* gods know why this sequence! */
outl(2, dev->iobase + PCI9118_AI_AUTOSCAN_MODE_REG);
outl(0, dev->iobase + PCI9118_AI_AUTOSCAN_MODE_REG);
@@ -1343,8 +1338,8 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
pci9118_ai_set_range_aref(dev, s, cmd->chanlist[0]);
if (!setup_channel_list(dev, s, cmd->chanlist_len,
- cmd->chanlist, 0, devpriv->ai_add_front,
- devpriv->ai_add_back, devpriv->usedma))
+ cmd->chanlist, devpriv->ai_add_front,
+ devpriv->ai_add_back))
return -EINVAL;
/* compute timers settings */
@@ -1458,7 +1453,7 @@ static int pci9118_ai_insn_read(struct comedi_device *dev,
devpriv->ai_cfg = PCI9118_AI_CFG_PDTRG | PCI9118_AI_CFG_PETRG;
outl(devpriv->ai_cfg, dev->iobase + PCI9118_AI_CFG_REG);
- if (!setup_channel_list(dev, s, 1, &insn->chanspec, 0, 0, 0, 0))
+ if (!setup_channel_list(dev, s, 1, &insn->chanspec, 0, 0))
return -EINVAL;
pci9118_ai_reset_fifo(dev);