Skip to contentSkip to conversation

comedi: ni_6527: Fix coding style - use BIT macro

PATCH In review Ranjith Thangavel 3 participants 3 messages Nov 14, 2015 – Nov 18, 2015 Staging

lore
Share & tools
lore

Ranjith Thangavel

author
#0 lore raw

PATCH 1/1 comedi: ni_6527: Fix coding style - use BIT macro

BIT macro is used for defining BIT location instead of shifting operator - coding style issue

Signed-off-by Ranjith Thangavel <[email protected]>
---
 drivers/staging/comedi/drivers/ni_6527.c |   27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)
drivers/staging/comedi/drivers/ni_6527.c +14 -13
index b340b98..1903d64 100644
@@ -32,6 +32,8 @@
 
 #include "../comedi_pci.h"
 
+#include "comedi_fc.h"
+
 /*
  * PCI BAR1 - Register memory map
  *

@@ -52,13 +54,13 @@
 #define NI6527_FILT_ENA_REG(x)		(0x0c + (x))
 #define NI6527_STATUS_REG		0x14
 #define NI6527_STATUS_IRQ		BIT(2)
-#define NI6527_STATUS_OVERFLOW	BIT(1)
+#define NI6527_STATUS_OVERFLOW		BIT(1)
 #define NI6527_STATUS_EDGE		BIT(0)
 #define NI6527_CTRL_REG			0x15
 #define NI6527_CTRL_FALLING		BIT(4)
 #define NI6527_CTRL_RISING		BIT(3)
 #define NI6527_CTRL_IRQ			BIT(2)
-#define NI6527_CTRL_OVERFLOW	BIT(1)
+#define NI6527_CTRL_OVERFLOW		BIT(1)
 #define NI6527_CTRL_EDGE		BIT(0)
 #define NI6527_CTRL_DISABLE_IRQS	0
 #define NI6527_CTRL_ENABLE_IRQS		(NI6527_CTRL_FALLING | \

@@ -221,11 +223,11 @@ static int ni6527_intr_cmdtest(struct comedi_device *dev,
 
 	/* Step 1 : check if triggers are trivially valid */
 
-	err |= comedi_check_trigger_src(&cmd->start_src, TRIG_NOW);
-	err |= comedi_check_trigger_src(&cmd->scan_begin_src, TRIG_OTHER);
-	err |= comedi_check_trigger_src(&cmd->convert_src, TRIG_FOLLOW);
-	err |= comedi_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);
-	err |= comedi_check_trigger_src(&cmd->stop_src, TRIG_COUNT);
+	err |= cfc_check_trigger_src(&cmd->start_src, TRIG_NOW);
+	err |= cfc_check_trigger_src(&cmd->scan_begin_src, TRIG_OTHER);
+	err |= cfc_check_trigger_src(&cmd->convert_src, TRIG_FOLLOW);
+	err |= cfc_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);
+	err |= cfc_check_trigger_src(&cmd->stop_src, TRIG_COUNT);
 
 	if (err)
 		return 1;

@@ -235,12 +237,11 @@ static int ni6527_intr_cmdtest(struct comedi_device *dev,
 
 	/* Step 3: check if arguments are trivially valid */
 
-	err |= comedi_check_trigger_arg_is(&cmd->start_arg, 0);
-	err |= comedi_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
-	err |= comedi_check_trigger_arg_is(&cmd->convert_arg, 0);
-	err |= comedi_check_trigger_arg_is(&cmd->scan_end_arg,
-					   cmd->chanlist_len);
-	err |= comedi_check_trigger_arg_is(&cmd->stop_arg, 0);
+	err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+	err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
+	err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+	err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+	err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
 	if (err)
 		return 3;
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 7 lines · Ranjith Thangavel
drivers/staging/comedi/drivers/ni_6527.c +0 -3
@@ -221,11 +223,11 @@ static int ni6527_intr_cmdtest(struct comedi_device *dev,
 
 	/* Step 1 : check if triggers are trivially valid */
 
-	err |= comedi_check_trigger_src(&cmd->start_src, TRIG_NOW);
-	err |= comedi_check_trigger_src(&cmd->scan_begin_src, TRIG_OTHER);
-	err |= comedi_check_trigger_src(&cmd->convert_src, TRIG_FOLLOW);

drivers/staging/comedi/drivers/ni_6527.c static int ni6527_intr_cmdtest(struct comedi_device *dev, · line 233

Quoted 10 lines
drivers/staging/comedi/drivers/ni_6527.c +5 -2
-	err |= comedi_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);
-	err |= comedi_check_trigger_src(&cmd->stop_src, TRIG_COUNT);
+	err |= cfc_check_trigger_src(&cmd->start_src, TRIG_NOW);
+	err |= cfc_check_trigger_src(&cmd->scan_begin_src, TRIG_OTHER);
+	err |= cfc_check_trigger_src(&cmd->convert_src, TRIG_FOLLOW);
+	err |= cfc_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);
+	err |= cfc_check_trigger_src(&cmd->stop_src, TRIG_COUNT);
 
 	if (err)
 		return 1;

This part looks to be included by mistake.

regards,
dan carpenter

#2 lore raw
In reply to Ranjith Thangavel
Quoted 13 lines · Ranjith Thangavel

BIT macro is used for defining BIT location instead of shifting operator - coding style issue

Signed-off-by Ranjith Thangavel <[email protected]>
---
  drivers/staging/comedi/drivers/ni_6527.c |   27 ++++++++++++++-------------
  1 file changed, 14 insertions(+), 13 deletions(-)
drivers/staging/comedi/drivers/ni_6527.c +0 -0
index b340b98..1903d64 100644

drivers/staging/comedi/drivers/ni_6527.c line 36

Quoted 5 lines
drivers/staging/comedi/drivers/ni_6527.c +2 -0
@@ -32,6 +32,8 @@
 
  #include "../comedi_pci.h"
 
+#include "comedi_fc.h"
+

That part seems to have been added in by mistake.

Quoted 9 lines
drivers/staging/comedi/drivers/ni_6527.c +1 -1
  /*
   * PCI BAR1 - Register memory map
   *

@@ -52,13 +54,13 @@
  #define NI6527_FILT_ENA_REG(x)		(0x0c + (x))
  #define NI6527_STATUS_REG		0x14
  #define NI6527_STATUS_IRQ		BIT(2)
-#define NI6527_STATUS_OVERFLOW	BIT(1)
+#define NI6527_STATUS_OVERFLOW		BIT(1)

drivers/staging/comedi/drivers/ni_6527.c line 66

Quoted 10 lines
drivers/staging/comedi/drivers/ni_6527.c +1 -1
  #define NI6527_STATUS_EDGE		BIT(0)
  #define NI6527_CTRL_REG			0x15
  #define NI6527_CTRL_FALLING		BIT(4)
  #define NI6527_CTRL_RISING		BIT(3)
  #define NI6527_CTRL_IRQ			BIT(2)
-#define NI6527_CTRL_OVERFLOW	BIT(1)
+#define NI6527_CTRL_OVERFLOW		BIT(1)
  #define NI6527_CTRL_EDGE		BIT(0)
  #define NI6527_CTRL_DISABLE_IRQS	0
  #define NI6527_CTRL_ENABLE_IRQS		(NI6527_CTRL_FALLING | \

That part seems to be based on top of your previous patch that had whitespace issues.

Quoted 26 lines
drivers/staging/comedi/drivers/ni_6527.c +5 -9
@@ -221,11 +223,11 @@ static int ni6527_intr_cmdtest(struct comedi_device *dev,
 
  	/* Step 1 : check if triggers are trivially valid */
 
-	err |= comedi_check_trigger_src(&cmd->start_src, TRIG_NOW);
-	err |= comedi_check_trigger_src(&cmd->scan_begin_src, TRIG_OTHER);
-	err |= comedi_check_trigger_src(&cmd->convert_src, TRIG_FOLLOW);
-	err |= comedi_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);
-	err |= comedi_check_trigger_src(&cmd->stop_src, TRIG_COUNT);
+	err |= cfc_check_trigger_src(&cmd->start_src, TRIG_NOW);
+	err |= cfc_check_trigger_src(&cmd->scan_begin_src, TRIG_OTHER);
+	err |= cfc_check_trigger_src(&cmd->convert_src, TRIG_FOLLOW);
+	err |= cfc_check_trigger_src(&cmd->scan_end_src, TRIG_COUNT);
+	err |= cfc_check_trigger_src(&cmd->stop_src, TRIG_COUNT);
 
  	if (err)
  		return 1;

@@ -235,12 +237,11 @@ static int ni6527_intr_cmdtest(struct comedi_device *dev,
 
  	/* Step 3: check if arguments are trivially valid */
 
-	err |= comedi_check_trigger_arg_is(&cmd->start_arg, 0);
-	err |= comedi_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
-	err |= comedi_check_trigger_arg_is(&cmd->convert_arg, 0);
-	err |= comedi_check_trigger_arg_is(&cmd->scan_end_arg,

drivers/staging/comedi/drivers/ni_6527.c static int ni6527_intr_cmdtest(struct comedi_device *dev, · line 247

Quoted 10 lines
drivers/staging/comedi/drivers/ni_6527.c +5 -2
-					   cmd->chanlist_len);
-	err |= comedi_check_trigger_arg_is(&cmd->stop_arg, 0);
+	err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);
+	err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
+	err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
+	err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
+	err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
 
  	if (err)
  		return 3;

As Dan Carpenter pointed out, this part has been added by mistake.

The parts added by mistake seem to be a throwback to an earlier kernel version.

Signature · 2 lines
-=( Ian Abbott @ MEV Ltd.    E-mail: <[email protected]> )=-
-=(                          Web: http://www.mev.co.uk/  )=-