[PATCH 2/2] Staging: comedi: fix WARNING issue in icp_multi.c
From: Ravishankar
Date: Wed Jul 06 2011 - 02:34:21 EST
From: Ravishankar <ravi.shankar@xxxxxxxxxxxxxxx>
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 <ravishankarkm32@xxxxxxxxx>
---
drivers/staging/comedi/drivers/icp_multi.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c
index 126550f..78f33e7 100644
--- a/drivers/staging/comedi/drivers/icp_multi.c
+++ b/drivers/staging/comedi/drivers/icp_multi.c
@@ -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);
--
1.7.1.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/