lkml.org 
[lkml]   [2011]   [Oct]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 21/24] Staging: comedi: fix warning issue in cb_das16_cs.c
Date
Added #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt.
converted printks to dev_printk.
Removed unnecessary printk statements.
Fixed line over 80 character and NULL initilization issue.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/cb_das16_cs.c | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c
index 8a1b8a7..71676d8 100644
--- a/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -31,6 +31,8 @@ Status: experimental

*/

+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/interrupt.h>
#include <linux/slab.h>
#include "../comedidev.h"
@@ -99,7 +101,7 @@ static struct comedi_driver driver_das16cs = {
.detach = das16cs_detach,
};

-static struct pcmcia_device *cur_dev = NULL;
+static struct pcmcia_device *cur_dev;

static const struct comedi_lrange das16cs_ai_range = { 4, {
RANGE(-10, 10),
@@ -150,7 +152,7 @@ static const struct das16cs_board *das16cs_probe(struct comedi_device *dev,
return das16cs_boards + i;
}

- printk("unknown board!\n");
+ dev_dbg(dev->hw_dev, "unknown board!\n");

return NULL;
}
@@ -163,20 +165,17 @@ static int das16cs_attach(struct comedi_device *dev,
int ret;
int i;

- printk("comedi%d: cb_das16_cs: ", dev->minor);

link = cur_dev; /* XXX hack */
if (!link)
return -EIO;

dev->iobase = link->resource[0]->start;
- printk("I/O base=0x%04lx ", dev->iobase);
+ dev_dbg(dev->hw_dev, "I/O base=0x%04lx\n", dev->iobase);

- printk("fingerprint:\n");
+ dev_dbg(dev->hw_dev, "fingerprint:\n");
for (i = 0; i < 48; i += 2)
- printk("%04x ", inw(dev->iobase + i));
-
- printk("\n");
+ dev_dbg(dev->hw_dev, "%04x\n", inw(dev->iobase + i));

ret = request_irq(link->irq, das16cs_interrupt,
IRQF_SHARED, "cb_das16_cs", dev);
@@ -185,7 +184,7 @@ static int das16cs_attach(struct comedi_device *dev,

dev->irq = link->irq;

- printk("irq=%u ", dev->irq);
+ dev_dbg(dev->hw_dev, "irq=%u\n", dev->irq);

dev->board_ptr = das16cs_probe(dev, link);
if (!dev->board_ptr)
@@ -252,14 +251,11 @@ static int das16cs_attach(struct comedi_device *dev,
s->type = COMEDI_SUBD_UNUSED;
}

- printk("attached\n");
-
return 1;
}

static int das16cs_detach(struct comedi_device *dev)
{
- printk("comedi%d: das16cs: remove\n", dev->minor);

if (dev->irq)
free_irq(dev->irq, dev);
@@ -312,7 +308,7 @@ static int das16cs_ai_rinsn(struct comedi_device *dev,
break;
}
if (to == TIMEOUT) {
- printk("cb_das16_cs: ai timeout\n");
+ dev_err(dev->hw_dev, "ai timeout\n");
return -ETIME;
}
data[i] = (unsigned short)inw(dev->iobase + 0);
@@ -370,7 +366,9 @@ static int das16cs_ai_cmdtest(struct comedi_device *dev,
if (err)
return 1;

- /* step 2: make sure trigger sources are unique and mutually compatible */
+ /*
+ * step 2: make sure trigger sources are unique and mutually compatible
+ */

/* note that mutual compatibility is not an issue here */
if (cmd->scan_begin_src != TRIG_TIMER &&
--
1.7.6.4


\
 
 \ /
  Last update: 2011-10-20 08:25    [from the cache]
©2003-2011 Jasper Spaans