From: H Hartley Sweeten Date: Tue, 14 May 2013 20:40:45 +0000 (-0700) Subject: staging: comedi: usbduxfast: rename CamelCase 'minSamplPer' X-Git-Tag: next-20130521~23^2~87 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bbb2d2d66cebaebc529bd816c539b88154639f48;p=karo-tx-linux.git staging: comedi: usbduxfast: rename CamelCase 'minSamplPer' Rename the local variable to fix the checkpatch.pl warning. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c index 7ca4fae3c01b..7702a3ec4c56 100644 --- a/drivers/staging/comedi/drivers/usbduxfast.c +++ b/drivers/staging/comedi/drivers/usbduxfast.c @@ -354,7 +354,7 @@ static int usbduxfast_ai_cmdtest(struct comedi_device *dev, { int err = 0; long int steps, tmp; - int minSamplPer; + int min_sample_period; /* Step 1 : check if triggers are trivially valid */ @@ -396,14 +396,14 @@ static int usbduxfast_ai_cmdtest(struct comedi_device *dev, err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len); if (cmd->chanlist_len == 1) - minSamplPer = 1; + min_sample_period = 1; else - minSamplPer = MIN_SAMPLING_PERIOD; + min_sample_period = MIN_SAMPLING_PERIOD; if (cmd->convert_src == TRIG_TIMER) { steps = cmd->convert_arg * 30; - if (steps < (minSamplPer * 1000)) - steps = minSamplPer * 1000; + if (steps < (min_sample_period * 1000)) + steps = min_sample_period * 1000; if (steps > (MAX_SAMPLING_PERIOD * 1000)) steps = MAX_SAMPLING_PERIOD * 1000;