Skip to contentSkip to conversation

Staging: comedi: fix WARNING issue in icp_multi.c

PATCH In review Ravishankar 2 participants 2 messages Jul 6, 2011 Staging

lore
Share & tools
lore

Ravishankar

author
#0 lore raw

PATCH 2/2 Staging: comedi: fix WARNING issue in icp_multi.c

From: Ravishankar <[email protected]>

This is a patch to the icp_multi.c file that fixes up a WARNING found by the checkpatch.pl tool

Signed-off-by Ravishankar <[email protected]>
---
 drivers/staging/comedi/drivers/icp_multi.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)
drivers/staging/comedi/drivers/icp_multi.c +6 -7
index 126550f..78f33e7 100644
@@ -59,13 +59,12 @@ Options:
 #include "icp_multi.h"
 
 #define DEVICE_ID	0x8000	/* Device ID */
+#define ICP_MULTI_EXTDEBUG	/*       */
 
-#define ICP_MULTI_EXTDEBUG
+/* Hardware types of the cards */
+#define TYPE_ICP_MULTI 0
 
-/*  Hardware types of the cards */
-#define TYPE_ICP_MULTI	0
-
-#define IORANGE_ICP_MULTI 	32
+#define IORANGE_ICP_MULTI 32
 
 #define ICP_MULTI_ADC_CSR	0	/* R/W: ADC command/status register */
 #define ICP_MULTI_AI		2	/* R:   Analogue input data */

@@ -572,7 +571,7 @@ static int icp_multi_insn_bits_do(struct comedi_device *dev,
 		s->state &= ~data[0];
 		s->state |= (data[0] & data[1]);
 
-		printk(KERN_DEBUG "Digital outputs = %4x \n", s->state);
+		printk(KERN_DEBUG "Digital outputs = %4x\n", s->state);
 
 		writew(s->state, devpriv->io_addr + ICP_MULTI_DO);
 	}

@@ -966,7 +965,7 @@ static int icp_multi_attach(struct comedi_device *dev,
 	devpriv->phys_iobase = iobase;
 
 	printk(KERN_WARNING
-	       ", b:s:f=%d:%d:%d, io=0x%8llx \n", pci_bus, pci_slot, pci_func,
+	       ", b:s:f=%d:%d:%d, io=0x%8llx\n", pci_bus, pci_slot, pci_func,
 	       (unsigned long long)iobase);
 
 	devpriv->io_addr = ioremap(iobase, ICP_MULTI_SIZE);
Signature · 1 line
1.7.1.1
#1 lore raw
Quoted 3 lines · Ravishankar

From: Ravishankar <[email protected]>

This is a patch to the icp_multi.c file that fixes up a WARNING found by the checkpatch.pl tool

What warning?

Quoted 15 lines
Signed-off-by Ravishankar <[email protected]>
---
 drivers/staging/comedi/drivers/icp_multi.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)
drivers/staging/comedi/drivers/icp_multi.c +1 -0
index 126550f..78f33e7 100644
@@ -59,13 +59,12 @@ Options:
 #include "icp_multi.h"
 
 #define DEVICE_ID	0x8000	/* Device ID */
+#define ICP_MULTI_EXTDEBUG	/*       */

drivers/staging/comedi/drivers/icp_multi.c Options: · line 67

Quoted 10 lines
drivers/staging/comedi/drivers/icp_multi.c +3 -5
 
-#define ICP_MULTI_EXTDEBUG
+/* Hardware types of the cards */
+#define TYPE_ICP_MULTI 0
 
-/*  Hardware types of the cards */
-#define TYPE_ICP_MULTI	0
-
-#define IORANGE_ICP_MULTI 	32
+#define IORANGE_ICP_MULTI 32

These changes did not fix up any "warning", why did you make them?

greg k-h