[PATCH 27/35] staging: comedi: das1800: rename burst_convert_arg()

H Hartley Sweeten hsweeten at visionengravers.com
Wed Apr 6 23:32:00 UTC 2016


Rename this function so it has namespace associated with the driver.
Remove the unnecessary comment about the function.

Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/comedi/drivers/das1800.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c
index feda499..bdf30f8 100644
--- a/drivers/staging/comedi/drivers/das1800.c
+++ b/drivers/staging/comedi/drivers/das1800.c
@@ -571,10 +571,8 @@ static irqreturn_t das1800_interrupt(int irq, void *d)
 	return IRQ_HANDLED;
 }
 
-/* converts requested conversion timing to timing compatible with
- * hardware, used only when card is in 'burst mode'
- */
-static unsigned int burst_convert_arg(unsigned int convert_arg, int flags)
+static unsigned int das1800_check_convert_arg(unsigned int convert_arg,
+					      int flags)
 {
 	unsigned int micro_sec;
 
@@ -696,7 +694,7 @@ static int das1800_ai_cmdtest(struct comedi_device *dev,
 		err |= comedi_check_trigger_arg_is(&cmd->convert_arg, arg);
 	} else if (cmd->convert_src == TRIG_TIMER) {
 		/* we are in burst mode */
-		arg = burst_convert_arg(cmd->convert_arg, cmd->flags);
+		arg = das1800_check_convert_arg(cmd->convert_arg, cmd->flags);
 		err |= comedi_check_trigger_arg_is(&cmd->convert_arg, arg);
 
 		if (cmd->scan_begin_src == TRIG_TIMER) {
-- 
2.6.3



More information about the devel mailing list