From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 9 Sep 2014 20:05:44 +0000 (-0700)
Subject: staging: comedi: adl_pci9118: rename setup_channel_list()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7d62b548ded7a5540ecd89fb38d0dab876aec78f;p=linux-beck.git

staging: comedi: adl_pci9118: rename setup_channel_list()

Rename this function so it has namespace associated with the driver.

Also, this function always succeeds. Change the return type to void
and remove the unnecessary error handling by the callers.

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>
---

diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index 67f8ff14efa8..89a6ea578968 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -385,10 +385,10 @@ static int check_channel_list(struct comedi_device *dev,
 	return 1;
 }
 
-static int setup_channel_list(struct comedi_device *dev,
-			      struct comedi_subdevice *s, int n_chan,
-			      unsigned int *chanlist, int frontadd,
-			      int backadd)
+static void pci9118_set_chanlist(struct comedi_device *dev,
+				 struct comedi_subdevice *s,
+				 int n_chan, unsigned int *chanlist,
+				 int frontadd, int backadd)
 {
 	struct pci9118_private *devpriv = dev->private;
 	unsigned int scanquad, gain, ssh = 0x00;
@@ -434,8 +434,6 @@ static int setup_channel_list(struct comedi_device *dev,
 	/* close scan queue */
 	outl(0, dev->iobase + PCI9118_AI_AUTOSCAN_MODE_REG);
 	/* udelay(100); important delay, or first sample will be crippled */
-
-	return 1;		/* we can serve this with scan logic */
 }
 
 static void interrupt_pci9118_ai_mode4_switch(struct comedi_device *dev,
@@ -1337,10 +1335,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, devpriv->ai_add_front,
-				devpriv->ai_add_back))
-		return -EINVAL;
+	pci9118_set_chanlist(dev, s, cmd->chanlist_len, cmd->chanlist,
+			     devpriv->ai_add_front, devpriv->ai_add_back);
 
 	/* compute timers settings */
 	/*
@@ -1453,8 +1449,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))
-		return -EINVAL;
+	pci9118_set_chanlist(dev, s, 1, &insn->chanspec, 0, 0);
 
 	pci9118_ai_reset_fifo(dev);