Browse Source

staging: comedi: usbduxsigma: tidy up chanToInterval()

Rename the function to have namespace associated with the driver.
Rename the CamelCase parameter 'nChannels' to avoid the checkpatch.pl
warning.

Tidy up the function a bit.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten 12 years ago
parent
commit
fffe8239f5
1 changed files with 7 additions and 10 deletions
  1. 7 10
      drivers/staging/comedi/drivers/usbduxsigma.c

+ 7 - 10
drivers/staging/comedi/drivers/usbduxsigma.c

@@ -502,16 +502,13 @@ static int usbduxsigma_submit_urbs(struct comedi_device *dev,
 	return 0;
 }
 
-static int chanToInterval(int nChannels)
+static int usbduxsigma_chans_to_interval(int num_chan)
 {
-	if (nChannels <= 2)
-		/* 4kHz */
-		return 2;
-	if (nChannels <= 8)
-		/* 2kHz */
-		return 4;
-	/* 1kHz */
-	return 8;
+	if (num_chan <= 2)
+		return 2;	/* 4kHz */
+	if (num_chan <= 8)
+		return 4;	/* 2kHz */
+	return 8;		/* 1kHz */
 }
 
 static int usbduxsigma_ai_cmdtest(struct comedi_device *dev,
@@ -520,7 +517,7 @@ static int usbduxsigma_ai_cmdtest(struct comedi_device *dev,
 {
 	struct usbduxsigma_private *devpriv = dev->private;
 	int high_speed = devpriv->high_speed;
-	int interval = chanToInterval(cmd->chanlist_len);
+	int interval = usbduxsigma_chans_to_interval(cmd->chanlist_len);
 	int err = 0;
 
 	/* Step 1 : check if triggers are trivially valid */