diff options
author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-05-23 20:09:08 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-30 11:41:11 (GMT) |
commit | fffe8239f51342f2c7ef7aa0f56bf6f210be258b (patch) | |
tree | 6ad64000fe2485eb33428753dcdece514824dcfc /drivers | |
parent | 7333d50b8adbb162b511950f8ba90900c99940e0 (diff) | |
download | linux-fsl-qoriq-fffe8239f51342f2c7ef7aa0f56bf6f210be258b.tar.xz |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/comedi/drivers/usbduxsigma.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c index e070477..a5883be 100644 --- a/drivers/staging/comedi/drivers/usbduxsigma.c +++ b/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 */ |