From fffe8239f51342f2c7ef7aa0f56bf6f210be258b Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 23 May 2013 13:09:08 -0700 Subject: [PATCH] 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 Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/usbduxsigma.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c index e070477ce532..a5883be7b48b 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 */ -- 2.39.5