* [PATCH 02/29] Staging: comedi: fix printk issue in dt3000.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 03/29] " Ravishankar karkala Mallikarjunayya
` (27 subsequent siblings)
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the dt3000.c file that fixes up a printk
warning found by the checkpatch.pl tool.
Added KERN_facility levels.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/dt3000.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c
index f9c16c9..8347bac 100644
--- a/drivers/staging/comedi/drivers/dt3000.c
+++ b/drivers/staging/comedi/drivers/dt3000.c
@@ -430,12 +430,12 @@ static char *intr_flags[] = {
static void debug_intr_flags(unsigned int flags)
{
int i;
- printk("dt3k: intr_flags:");
+ printk(KERN_DEBUG "dt3k: intr_flags:");
for (i = 0; i < 8; i++) {
if (flags & (1 << i))
- printk(" %s", intr_flags[i]);
+ printk(KERN_CONT " %s", intr_flags[i]);
}
- printk("\n");
+ printk(KERN_CONT "\n");
}
#endif
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 03/29] Staging: comedi: fix printk issue in dt3000.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 02/29] " Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 04/29] " Ravishankar karkala Mallikarjunayya
` (26 subsequent siblings)
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the dt3000.c file that fixes up a
printk warning found by the checkpatch.pl tool.
Converted printks to dev_<levels>.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/dt3000.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c
index 8347bac..57361d1 100644
--- a/drivers/staging/comedi/drivers/dt3000.c
+++ b/drivers/staging/comedi/drivers/dt3000.c
@@ -849,7 +849,7 @@ static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
int bus, slot;
int ret = 0;
- printk("dt3000:");
+ dev_dbg(dev->hw_dev, "dt3000:\n");
bus = it->options[0];
slot = it->options[1];
@@ -861,7 +861,7 @@ static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret < 0)
return ret;
if (ret == 0) {
- printk(" no DT board found\n");
+ dev_warn(dev->hw_dev, "no DT board found\n");
return -ENODEV;
}
@@ -869,7 +869,8 @@ static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (request_irq(devpriv->pci_dev->irq, dt3k_interrupt, IRQF_SHARED,
"dt3000", dev)) {
- printk(" unable to allocate IRQ %u\n", devpriv->pci_dev->irq);
+ dev_err(dev->hw_dev, "unable to allocate IRQ %u\n",
+ devpriv->pci_dev->irq);
return -EINVAL;
}
dev->irq = devpriv->pci_dev->irq;
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 04/29] Staging: comedi: fix printk issue in dt3000.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 02/29] " Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 03/29] " Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 05/29] " Ravishankar karkala Mallikarjunayya
` (25 subsequent siblings)
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the dt3000.c file that fixes up a printk
warning found by the checkpatch.pl tool.
Converted printks to dev_functions.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/dt3000.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c
index 57361d1..2542458 100644
--- a/drivers/staging/comedi/drivers/dt3000.c
+++ b/drivers/staging/comedi/drivers/dt3000.c
@@ -641,7 +641,7 @@ static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
int ret;
unsigned int mode;
- printk("dt3k_ai_cmd:\n");
+ dev_dbg(dev->hw_dev, "dt3k_ai_cmd:\n");
for (i = 0; i < cmd->chanlist_len; i++) {
chan = CR_CHAN(cmd->chanlist[i]);
range = CR_RANGE(cmd->chanlist[i]);
@@ -652,15 +652,15 @@ static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
aref = CR_AREF(cmd->chanlist[0]);
writew(cmd->scan_end_arg, devpriv->io_addr + DPR_Params(0));
- printk("param[0]=0x%04x\n", cmd->scan_end_arg);
+ dev_dbg(dev->hw_dev, "param[0]=0x%04x\n", cmd->scan_end_arg);
if (cmd->convert_src == TRIG_TIMER) {
divider = dt3k_ns_to_timer(50, &cmd->convert_arg,
cmd->flags & TRIG_ROUND_MASK);
writew((divider >> 16), devpriv->io_addr + DPR_Params(1));
- printk("param[1]=0x%04x\n", divider >> 16);
+ dev_dbg(dev->hw_dev, "param[1]=0x%04x\n", divider >> 16);
writew((divider & 0xffff), devpriv->io_addr + DPR_Params(2));
- printk("param[2]=0x%04x\n", divider & 0xffff);
+ dev_dbg(dev->hw_dev, "param[2]=0x%04x\n", divider & 0xffff);
} else {
/* not supported */
}
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 05/29] Staging: comedi: fix printk issue in dt3000.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (2 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 04/29] " Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 06/29] Staging: comedi: fix printk issue in pcmuio.c Ravishankar karkala Mallikarjunayya
` (24 subsequent siblings)
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the dt3000.c file that fixes up a printk
warning found by the checkpatch.pl tool.
Converted printks to dev_<levels>.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/dt3000.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c
index 2542458..b5a63ee 100644
--- a/drivers/staging/comedi/drivers/dt3000.c
+++ b/drivers/staging/comedi/drivers/dt3000.c
@@ -669,21 +669,21 @@ static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
tscandiv = dt3k_ns_to_timer(100, &cmd->scan_begin_arg,
cmd->flags & TRIG_ROUND_MASK);
writew((tscandiv >> 16), devpriv->io_addr + DPR_Params(3));
- printk("param[3]=0x%04x\n", tscandiv >> 16);
+ dev_dbg(dev->hw_dev, "param[3]=0x%04x\n", tscandiv >> 16);
writew((tscandiv & 0xffff), devpriv->io_addr + DPR_Params(4));
- printk("param[4]=0x%04x\n", tscandiv & 0xffff);
+ dev_dbg(dev->hw_dev, "param[4]=0x%04x\n", tscandiv & 0xffff);
} else {
/* not supported */
}
mode = DT3000_AD_RETRIG_INTERNAL | 0 | 0;
writew(mode, devpriv->io_addr + DPR_Params(5));
- printk("param[5]=0x%04x\n", mode);
+ dev_dbg(dev->hw_dev, "param[5]=0x%04x\n", mode);
writew(aref == AREF_DIFF, devpriv->io_addr + DPR_Params(6));
- printk("param[6]=0x%04x\n", aref == AREF_DIFF);
+ dev_dbg(dev->hw_dev, "param[6]=0x%04x\n", aref == AREF_DIFF);
writew(AI_FIFO_DEPTH / 2, devpriv->io_addr + DPR_Params(7));
- printk("param[7]=0x%04x\n", AI_FIFO_DEPTH / 2);
+ dev_dbg(dev->hw_dev, "param[7]=0x%04x\n", AI_FIFO_DEPTH / 2);
writew(SUBS_AI, devpriv->io_addr + DPR_SubSys);
ret = dt3k_send_cmd(dev, CMD_CONFIG);
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 06/29] Staging: comedi: fix printk issue in pcmuio.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (3 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 05/29] " Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 07/29] " Ravishankar karkala Mallikarjunayya
` (23 subsequent siblings)
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the pcmuio.c file that fixes up a printk
warning found by the checkpatch.pl tool.
Converted printks to dev_functions.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/pcmuio.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c
index 0c5b06d..41f843b 100644
--- a/drivers/staging/comedi/drivers/pcmuio.c
+++ b/drivers/staging/comedi/drivers/pcmuio.c
@@ -295,15 +295,15 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
irq[0] = it->options[1];
irq[1] = it->options[2];
- printk("comedi%d: %s: io: %lx ", dev->minor, driver.driver_name,
- iobase);
+ dev_dbg(dev->hw_dev, "comedi%d: %s: io: %lx attached\n", dev->minor,
+ driver.driver_name, iobase);
dev->iobase = iobase;
if (!iobase || !request_region(iobase,
thisboard->num_asics * ASIC_IOSIZE,
driver.driver_name)) {
- printk("I/O port conflict\n");
+ dev_err(dev->hw_dev, "I/O port conflict\n");
return -EIO;
}
@@ -318,7 +318,7 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
* convenient macro defined in comedidev.h.
*/
if (alloc_private(dev, sizeof(struct pcmuio_private)) < 0) {
- printk("cannot allocate private data structure\n");
+ dev_warn(dev->hw_dev, "cannot allocate private data structure\n");
return -ENOMEM;
}
@@ -337,7 +337,7 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
kcalloc(n_subdevs, sizeof(struct pcmuio_subdev_private),
GFP_KERNEL);
if (!devpriv->sprivs) {
- printk("cannot allocate subdevice private data structures\n");
+ dev_warn(dev->hw_dev, "cannot allocate subdevice private data structures\n");
return -ENOMEM;
}
/*
@@ -348,7 +348,7 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
* 96-channel version of the board.
*/
if (alloc_subdevices(dev, n_subdevs) < 0) {
- printk("cannot allocate subdevice data structures\n");
+ dev_dbg(dev->hw_dev, "cannot allocate subdevice data structures\n");
return -ENOMEM;
}
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 07/29] Staging: comedi: fix printk issue in pcmuio.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (4 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 06/29] Staging: comedi: fix printk issue in pcmuio.c Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 08/29] " Ravishankar karkala Mallikarjunayya
` (22 subsequent siblings)
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the pcmuio.c file that fixes up a printk
warning found by the checkpatch.pl tool.
Converted printks to dev_functions.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/pcmuio.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c
index 41f843b..9a5dc91 100644
--- a/drivers/staging/comedi/drivers/pcmuio.c
+++ b/drivers/staging/comedi/drivers/pcmuio.c
@@ -436,14 +436,13 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
irqs.. */
if (irq[0]) {
- printk("irq: %u ", irq[0]);
+ dev_dbg(dev->hw_dev, "irq: %u\n", irq[0]);
if (irq[1] && thisboard->num_asics == 2)
- printk("second ASIC irq: %u ", irq[1]);
+ dev_dbg(dev->hw_dev, "second ASIC irq: %u\n", irq[1]);
} else {
- printk("(IRQ mode disabled) ");
+ dev_dbg(dev->hw_dev, "(IRQ mode disabled)\n");
}
- printk("attached\n");
return 1;
}
@@ -460,7 +459,8 @@ static int pcmuio_detach(struct comedi_device *dev)
{
int i;
- printk("comedi%d: %s: remove\n", dev->minor, driver.driver_name);
+ dev_dbg(dev->hw_dev, "comedi%d: %s: remove\n", dev->minor,
+ driver.driver_name);
if (dev->iobase)
release_region(dev->iobase, ASIC_IOSIZE * thisboard->num_asics);
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 08/29] Staging: comedi: fix printk issue in pcmuio.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (5 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 07/29] " Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 09/29] Staging: comedi: fix printk issue in daqboard2000.c Ravishankar karkala Mallikarjunayya
` (21 subsequent siblings)
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the pcmuio.c file that fixes up a printk
warning found by the checkpatch.pl tool.
Converted printks to dev_dbg().
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/pcmuio.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c
index 9a5dc91..661ba2e 100644
--- a/drivers/staging/comedi/drivers/pcmuio.c
+++ b/drivers/staging/comedi/drivers/pcmuio.c
@@ -501,7 +501,8 @@ static int pcmuio_dio_insn_bits(struct comedi_device *dev,
#ifdef DAMMIT_ITS_BROKEN
/* DEBUG */
- printk("write mask: %08x data: %08x\n", data[0], data[1]);
+ dev_dbg(dev->hw_dev, "write mask: %08x data: %08x\n", data[0],
+ data[1]);
#endif
s->state = 0;
@@ -537,7 +538,7 @@ static int pcmuio_dio_insn_bits(struct comedi_device *dev,
}
#ifdef DAMMIT_ITS_BROKEN
/* DEBUG */
- printk("data_out_byte %02x\n", (unsigned)byte);
+ dev_dbg(dev->hw_dev, "data_out_byte %02x\n", (unsigned)byte);
#endif
/* save the digital input lines for this byte.. */
s->state |= ((unsigned int)byte) << offset;
@@ -548,7 +549,8 @@ static int pcmuio_dio_insn_bits(struct comedi_device *dev,
#ifdef DAMMIT_ITS_BROKEN
/* DEBUG */
- printk("s->state %08x data_out %08x\n", s->state, data[1]);
+ dev_dbg(dev->hw_dev, "s->state %08x data_out %08x\n", s->state,
+ data[1]);
#endif
return 2;
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 09/29] Staging: comedi: fix printk issue in daqboard2000.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (6 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 08/29] " Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 10/29] Staging: comedi: fix line over 80 character " Ravishankar karkala Mallikarjunayya
` (20 subsequent siblings)
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the daqboard2000.c file that fixes up a printk
warning found by the checkpatch.pl tool.
Converted printks to dev_dbg().
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/daqboard2000.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index 9958bd5..270d5d8 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -506,7 +506,7 @@ static int daqboard2000_ao_insn_write(struct comedi_device *dev,
static void daqboard2000_resetLocalBus(struct comedi_device *dev)
{
- printk("daqboard2000_resetLocalBus\n");
+ dev_dbg(dev->hw_dev, "daqboard2000_resetLocalBus\n");
writel(DAQBOARD2000_SECRLocalBusHi, devpriv->plx + 0x6c);
udelay(10000);
writel(DAQBOARD2000_SECRLocalBusLo, devpriv->plx + 0x6c);
@@ -515,7 +515,7 @@ static void daqboard2000_resetLocalBus(struct comedi_device *dev)
static void daqboard2000_reloadPLX(struct comedi_device *dev)
{
- printk("daqboard2000_reloadPLX\n");
+ dev_dbg(dev->hw_dev, "daqboard2000_reloadPLX\n");
writel(DAQBOARD2000_SECRReloadLo, devpriv->plx + 0x6c);
udelay(10000);
writel(DAQBOARD2000_SECRReloadHi, devpriv->plx + 0x6c);
@@ -526,7 +526,7 @@ static void daqboard2000_reloadPLX(struct comedi_device *dev)
static void daqboard2000_pulseProgPin(struct comedi_device *dev)
{
- printk("daqboard2000_pulseProgPin 1\n");
+ dev_dbg(dev->hw_dev, "daqboard2000_pulseProgPin 1\n");
writel(DAQBOARD2000_SECRProgPinHi, devpriv->plx + 0x6c);
udelay(10000);
writel(DAQBOARD2000_SECRProgPinLo, devpriv->plx + 0x6c);
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 10/29] Staging: comedi: fix line over 80 character issue in daqboard2000.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (7 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 09/29] Staging: comedi: fix printk issue in daqboard2000.c Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-14 0:26 ` Greg KH
2011-12-12 5:19 ` [PATCH 11/29] Staging: comedi: fix printk " Ravishankar karkala Mallikarjunayya
` (19 subsequent siblings)
28 siblings, 1 reply; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the daqboard2000.c file that fixes up a
line over 80 character warning found by the checkpatch.pl tool.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/daqboard2000.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index 270d5d8..54145dc 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -414,7 +414,8 @@ static int daqboard2000_ai_insn_read(struct comedi_device *dev,
/* If pacer clock is not set to some high value (> 10 us), we
risk multiple samples to be put into the result FIFO. */
- fpga->acqPacerClockDivLow = 1000000; /* 1 second, should be long enough */
+ /* 1 second, should be long enough */
+ fpga->acqPacerClockDivLow = 1000000;
fpga->acqPacerClockDivHigh = 0;
gain = CR_RANGE(insn->chanspec);
@@ -486,7 +487,10 @@ static int daqboard2000_ao_insn_write(struct comedi_device *dev,
* OK, since it works OK without enabling the DAC's, let's keep
* it as simple as possible...
*/
- /* fpga->dacControl = (chan + 2) * 0x0010 | 0x0001; udelay(1000); */
+ /*
+ * fpga->dacControl = (chan + 2) * 0x0010 | 0x0001;
+ * udelay(1000);
+ */
fpga->dacSetting[chan] = data[i];
for (timeout = 0; timeout < 20; timeout++) {
if ((fpga->dacControl & ((chan + 1) * 0x0010)) == 0) {
@@ -530,7 +534,8 @@ static void daqboard2000_pulseProgPin(struct comedi_device *dev)
writel(DAQBOARD2000_SECRProgPinHi, devpriv->plx + 0x6c);
udelay(10000);
writel(DAQBOARD2000_SECRProgPinLo, devpriv->plx + 0x6c);
- udelay(10000); /* Not in the original code, but I like symmetry... */
+ /* Not in the original code, but I like symmetry... */
+ udelay(10000);
}
static int daqboard2000_pollCPLD(struct comedi_device *dev, int mask)
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 11/29] Staging: comedi: fix printk issue in daqboard2000.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (8 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 10/29] Staging: comedi: fix line over 80 character " Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 12/29] Staging: comedi: fix printk issue in jr3_pci.c Ravishankar karkala Mallikarjunayya
` (18 subsequent siblings)
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the daqboard2000.c file that fixes up a printk
warning found by the checkpatch.pl tool.
converted printks to dev_printk and Removed unnecessary
printk statements.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/daqboard2000.c | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index 54145dc..0b498de 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -739,8 +739,6 @@ static int daqboard2000_attach(struct comedi_device *dev,
unsigned int aux_len;
int bus, slot;
- printk("comedi%d: daqboard2000:", dev->minor);
-
bus = it->options[0];
slot = it->options[1];
@@ -761,10 +759,10 @@ static int daqboard2000_attach(struct comedi_device *dev,
}
if (!card) {
if (bus || slot)
- printk(" no daqboard2000 found at bus/slot: %d/%d\n",
- bus, slot);
+ dev_err(dev->hw_dev, "no daqboard2000 found at bus/slot: %d/%d\n",
+ bus, slot);
else
- printk(" no daqboard2000 found\n");
+ dev_err(dev->hw_dev, "no daqboard2000 found\n");
return -EIO;
} else {
u32 id;
@@ -774,7 +772,8 @@ static int daqboard2000_attach(struct comedi_device *dev,
subsystem_device << 16) | card->subsystem_vendor;
for (i = 0; i < n_boardtypes; i++) {
if (boardtypes[i].id == id) {
- printk(" %s", boardtypes[i].name);
+ dev_dbg(dev->hw_dev, "%s\n",
+ boardtypes[i].name);
dev->board_ptr = boardtypes + i;
}
}
@@ -788,7 +787,7 @@ static int daqboard2000_attach(struct comedi_device *dev,
result = comedi_pci_enable(card, "daqboard2000");
if (result < 0) {
- printk(" failed to enable PCI device and request regions\n");
+ dev_err(dev->hw_dev, "failed to enable PCI device and request regions\n");
return -EIO;
}
devpriv->got_regions = 1;
@@ -818,7 +817,7 @@ static int daqboard2000_attach(struct comedi_device *dev,
if (aux_data && aux_len) {
result = initialize_daqboard2000(dev, aux_data, aux_len);
} else {
- printk("no FPGA initialization code, aborting\n");
+ dev_dbg(dev->hw_dev, "no FPGA initialization code, aborting\n");
result = -EIO;
}
if (result < 0)
@@ -858,15 +857,12 @@ static int daqboard2000_attach(struct comedi_device *dev,
result = subdev_8255_init(dev, s, daqboard2000_8255_cb,
(unsigned long)(dev->iobase + 0x40));
- printk("\n");
out:
return result;
}
static int daqboard2000_detach(struct comedi_device *dev)
{
- printk("comedi%d: daqboard2000: remove\n", dev->minor);
-
if (dev->subdevices)
subdev_8255_cleanup(dev, dev->subdevices + 2);
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 12/29] Staging: comedi: fix printk issue in jr3_pci.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (9 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 11/29] Staging: comedi: fix printk " Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 13/29] " Ravishankar karkala Mallikarjunayya
` (17 subsequent siblings)
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the jr3_pci.c file that fixes up a
printk warning found by the checkpatch.pl tool.
Converted printks to dev_dbg().
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/jr3_pci.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
index 56f7e26..2d3d1b2 100644
--- a/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/drivers/staging/comedi/drivers/jr3_pci.c
@@ -372,14 +372,14 @@ static int jr3_pci_open(struct comedi_device *dev)
int i;
struct jr3_pci_dev_private *devpriv = dev->private;
- printk("jr3_pci_open\n");
+ dev_dbg(dev->hw_dev, "jr3_pci_open\n");
for (i = 0; i < devpriv->n_channels; i++) {
struct jr3_pci_subdev_private *p;
p = dev->subdevices[i].private;
if (p) {
- printk("serial: %p %d (%d)\n", p, p->serial_no,
- p->channel_no);
+ dev_dbg(dev->hw_dev, "serial: %p %d (%d)\n", p,
+ p->serial_no, p->channel_no);
}
}
return 0;
@@ -457,8 +457,8 @@ static int jr3_download_firmware(struct comedi_device *dev, const u8 * data,
break;
more = more
&& read_idm_word(data, size, &pos, &addr);
- printk("Loading#%d %4.4x bytes at %4.4x\n", i,
- count, addr);
+ dev_dbg(dev->hw_dev, "Loading#%d %4.4x bytes at %4.4x\n",
+ i, count, addr);
while (more && count > 0) {
if (addr & 0x4000) {
/* 16 bit data, never seen in real life!! */
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 13/29] Staging: comedi: fix printk issue in jr3_pci.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (10 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 12/29] Staging: comedi: fix printk issue in jr3_pci.c Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 14/29] Staging: comedi: fix brace coding style issue in ni_at_a2150.c Ravishankar karkala Mallikarjunayya
` (16 subsequent siblings)
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the jr3_pci.c file that fixes up a
printk warning found by the checkpatch.pl tool.
Converted printks to dev_<levels> and Removed unnecessary
printk statements.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/jr3_pci.c | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
index 2d3d1b2..2a97894 100644
--- a/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/drivers/staging/comedi/drivers/jr3_pci.c
@@ -773,14 +773,12 @@ static int jr3_pci_attach(struct comedi_device *dev,
int opt_bus, opt_slot, i;
struct jr3_pci_dev_private *devpriv;
- printk("comedi%d: jr3_pci\n", dev->minor);
-
opt_bus = it->options[0];
opt_slot = it->options[1];
if (sizeof(struct jr3_channel) != 0xc00) {
- printk("sizeof(struct jr3_channel) = %x [expected %x]\n",
- (unsigned)sizeof(struct jr3_channel), 0xc00);
+ dev_err(dev->hw_dev, "sizeof(struct jr3_channel) = %x [expected %x]\n",
+ (unsigned)sizeof(struct jr3_channel), 0xc00);
return -EINVAL;
}
@@ -834,7 +832,7 @@ static int jr3_pci_attach(struct comedi_device *dev,
}
}
if (!card) {
- printk(" no jr3_pci found\n");
+ dev_err(dev->hw_dev, "no jr3_pci found\n");
return -EIO;
} else {
devpriv->pci_dev = card;
@@ -869,10 +867,10 @@ static int jr3_pci_attach(struct comedi_device *dev,
p = dev->subdevices[i].private;
p->channel = &devpriv->iobase->channel[i].data;
- printk("p->channel %p %p (%tx)\n",
- p->channel, devpriv->iobase,
- ((char *)(p->channel) -
- (char *)(devpriv->iobase)));
+ dev_dbg(dev->hw_dev, "p->channel %p %p (%tx)\n",
+ p->channel, devpriv->iobase,
+ ((char *)(p->channel) -
+ (char *)(devpriv->iobase)));
p->channel_no = i;
for (j = 0; j < 8; j++) {
int k;
@@ -910,7 +908,7 @@ static int jr3_pci_attach(struct comedi_device *dev,
devpriv->iobase->channel[0].reset = 0;
result = comedi_load_firmware(dev, "jr3pci.idm", jr3_download_firmware);
- printk("Firmare load %d\n", result);
+ dev_dbg(dev->hw_dev, "Firmare load %d\n", result);
if (result < 0)
goto out;
@@ -928,9 +926,9 @@ static int jr3_pci_attach(struct comedi_device *dev,
*/
msleep_interruptible(25);
for (i = 0; i < 0x18; i++) {
- printk("%c",
- get_u16(&devpriv->iobase->channel[0].
- data.copyright[i]) >> 8);
+ dev_dbg(dev->hw_dev, "%c\n",
+ get_u16(&devpriv->iobase->channel[0].
+ data.copyright[i]) >> 8);
}
/* Start card timer */
@@ -957,7 +955,6 @@ static int jr3_pci_detach(struct comedi_device *dev)
int i;
struct jr3_pci_dev_private *devpriv = dev->private;
- printk("comedi%d: jr3_pci: remove\n", dev->minor);
if (devpriv) {
del_timer_sync(&devpriv->timer);
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 14/29] Staging: comedi: fix brace coding style issue in ni_at_a2150.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (11 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 13/29] " Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 15/29] " Ravishankar karkala Mallikarjunayya
` (15 subsequent siblings)
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the ni_at_a2150.c file that fixes up a brace
warning found by the checkpatch.pl tool.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/ni_at_a2150.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c
index 32e675e..c25e44c 100644
--- a/drivers/staging/comedi/drivers/ni_at_a2150.c
+++ b/drivers/staging/comedi/drivers/ni_at_a2150.c
@@ -731,9 +731,8 @@ static int a2150_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
outw(trigger_bits, dev->iobase + TRIGGER_REG);
/* start acquisition for soft trigger */
- if (cmd->start_src == TRIG_NOW) {
+ if (cmd->start_src == TRIG_NOW)
outw(0, dev->iobase + FIFO_START_REG);
- }
#ifdef A2150_DEBUG
ni_dump_regs(dev);
#endif
@@ -860,11 +859,10 @@ static int a2150_get_timing(struct comedi_device *dev, unsigned int *period,
case TRIG_ROUND_NEAREST:
default:
/* if least upper bound is better approximation */
- if (lub - *period < *period - glb) {
+ if (lub - *period < *period - glb)
*period = lub;
- } else {
+ else
*period = glb;
- }
break;
case TRIG_ROUND_UP:
*period = lub;
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 15/29] Staging: comedi: fix brace coding style issue in ni_at_a2150.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (12 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 14/29] Staging: comedi: fix brace coding style issue in ni_at_a2150.c Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-14 0:29 ` Greg KH
2011-12-12 5:19 ` [PATCH 16/29] " Ravishankar karkala Mallikarjunayya
` (14 subsequent siblings)
28 siblings, 1 reply; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the ni_at_a2150.c file that fixes up a brace
warning found by the checkpatch.pl tool.
Converted printks to dev_<levels>.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/ni_at_a2150.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c
index c25e44c..26f204c 100644
--- a/drivers/staging/comedi/drivers/ni_at_a2150.c
+++ b/drivers/staging/comedi/drivers/ni_at_a2150.c
@@ -366,13 +366,13 @@ static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return -ENOMEM;
if (iobase == 0) {
- printk(" io base address required\n");
+ dev_err(dev->hw_dev, "io base address required\n");
return -EINVAL;
}
/* check if io addresses are available */
if (!request_region(iobase, A2150_SIZE, driver_a2150.driver_name)) {
- printk(" I/O port conflict\n");
+ dev_err(dev->hw_dev, "I/O port conflict\n");
return -EIO;
}
dev->iobase = iobase;
@@ -381,12 +381,13 @@ static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (irq) {
/* check that irq is supported */
if (irq < 3 || irq == 8 || irq == 13 || irq > 15) {
- printk(" invalid irq line %u\n", irq);
+ dev_err(dev->hw_dev, "invalid irq line %u\n", irq);
return -EINVAL;
}
if (request_irq(irq, a2150_interrupt, 0,
driver_a2150.driver_name, dev)) {
- printk("unable to allocate irq %u\n", irq);
+ dev_err(dev->hw_dev, "unable to allocate irq %u\n",
+ irq);
return -EINVAL;
}
devpriv->irq_dma_bits |= IRQ_LVL_BITS(irq);
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* Re: [PATCH 15/29] Staging: comedi: fix brace coding style issue in ni_at_a2150.c
2011-12-12 5:19 ` [PATCH 15/29] " Ravishankar karkala Mallikarjunayya
@ 2011-12-14 0:29 ` Greg KH
0 siblings, 0 replies; 35+ messages in thread
From: Greg KH @ 2011-12-14 0:29 UTC (permalink / raw)
To: Ravishankar karkala Mallikarjunayya; +Cc: gregkh, wfp5p, devel, linux-kernel
On Mon, Dec 12, 2011 at 10:49:27AM +0530, Ravishankar karkala Mallikarjunayya wrote:
> This is a patch to the ni_at_a2150.c file that fixes up a brace
> warning found by the checkpatch.pl tool.
No it doesn't.
> Converted printks to dev_<levels>.
It does this.
Ugh, reviewing your patches is hard when you do stuff like this, come
on, be more careful...
I can't accept this.
greg k-h
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 16/29] Staging: comedi: fix brace coding style issue in ni_at_a2150.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (13 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 15/29] " Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-14 0:30 ` Greg KH
2011-12-12 5:19 ` [PATCH 17/29] Staging: comedi: fix printk issue in das1800.c Ravishankar karkala Mallikarjunayya
` (13 subsequent siblings)
28 siblings, 1 reply; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the ni_at_a2150.c file that fixes up a brace
warning found by the checkpatch.pl tool.
Converted printks to dev_<levels>.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/ni_at_a2150.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c
index 26f204c..ca4ddc2 100644
--- a/drivers/staging/comedi/drivers/ni_at_a2150.c
+++ b/drivers/staging/comedi/drivers/ni_at_a2150.c
@@ -396,11 +396,12 @@ static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* initialize dma */
if (dma) {
if (dma == 4 || dma > 7) {
- printk(" invalid dma channel %u\n", dma);
+ dev_err(dev->hw_dev, "invalid dma channel %u\n", dma);
return -EINVAL;
}
if (request_dma(dma, driver_a2150.driver_name)) {
- printk(" failed to allocate dma channel %u\n", dma);
+ dev_dbg(dev->hw_dev, "failed to allocate dma channel %u\n",
+ dma);
return -EINVAL;
}
devpriv->dma = dma;
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* Re: [PATCH 16/29] Staging: comedi: fix brace coding style issue in ni_at_a2150.c
2011-12-12 5:19 ` [PATCH 16/29] " Ravishankar karkala Mallikarjunayya
@ 2011-12-14 0:30 ` Greg KH
0 siblings, 0 replies; 35+ messages in thread
From: Greg KH @ 2011-12-14 0:30 UTC (permalink / raw)
To: Ravishankar karkala Mallikarjunayya; +Cc: gregkh, wfp5p, devel, linux-kernel
On Mon, Dec 12, 2011 at 10:49:28AM +0530, Ravishankar karkala Mallikarjunayya wrote:
> This is a patch to the ni_at_a2150.c file that fixes up a brace
> warning found by the checkpatch.pl tool.
Again, no it does not.
ugh, it's as if you want me to want to reject these...
greg k-h
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 17/29] Staging: comedi: fix printk issue in das1800.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (14 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 16/29] " Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 18/29] Staging: comedi: fix printk issue in daqboard2000.c Ravishankar karkala Mallikarjunayya
` (12 subsequent siblings)
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the das1800.c file that fixes up a
printk warning found by the checkpatch.pl tool.
Converted printks to dev_<levels>.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/das1800.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c
index a6df30b..e89db9a 100644
--- a/drivers/staging/comedi/drivers/das1800.c
+++ b/drivers/staging/comedi/drivers/das1800.c
@@ -580,15 +580,16 @@ static int das1800_init_dma(struct comedi_device *dev, unsigned int dma0,
break;
}
if (request_dma(dma0, driver_das1800.driver_name)) {
- printk(" failed to allocate dma channel %i\n", dma0);
+ dev_err(dev->hw_dev, "failed to allocate dma channel %i\n",
+ dma0);
return -EINVAL;
}
devpriv->dma0 = dma0;
devpriv->dma_current = dma0;
if (dma1) {
if (request_dma(dma1, driver_das1800.driver_name)) {
- printk(" failed to allocate dma channel %i\n",
- dma1);
+ dev_err(dev->hw_dev, "failed to allocate dma channel %i\n",
+ dma1);
return -EINVAL;
}
devpriv->dma1 = dma1;
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 18/29] Staging: comedi: fix printk issue in daqboard2000.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (15 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 17/29] Staging: comedi: fix printk issue in das1800.c Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 19/29] Staging: comedi: fix printk issue in das1800.c Ravishankar karkala Mallikarjunayya
` (11 subsequent siblings)
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the daqboard2000.c file that fixes up a
printk warning found by the checkpatch.pl tool.
Converted printks to dev_dbg().
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/daqboard2000.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index 0b498de..b98858d 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -583,14 +583,14 @@ static int initialize_daqboard2000(struct comedi_device *dev,
secr = readl(devpriv->plx + 0x6c);
if (!(secr & DAQBOARD2000_EEPROM_PRESENT)) {
#ifdef DEBUG_EEPROM
- printk("no serial eeprom\n");
+ dev_dbg(dev->hw_dev, "no serial eeprom\n");
#endif
return -EIO;
}
for (retry = 0; retry < 3; retry++) {
#ifdef DEBUG_EEPROM
- printk("Programming EEPROM try %x\n", retry);
+ dev_dbg(dev->hw_dev, "Programming EEPROM try %x\n", retry);
#endif
daqboard2000_resetLocalBus(dev);
@@ -601,7 +601,8 @@ static int initialize_daqboard2000(struct comedi_device *dev,
if (cpld_array[i] == 0xff
&& cpld_array[i + 1] == 0x20) {
#ifdef DEBUG_EEPROM
- printk("Preamble found at %d\n", i);
+ dev_dbg(dev->hw_dev, "Preamble found at %d\n",
+ i);
#endif
break;
}
@@ -615,7 +616,7 @@ static int initialize_daqboard2000(struct comedi_device *dev,
}
if (i >= len) {
#ifdef DEBUG_EEPROM
- printk("Programmed\n");
+ dev_dbg(dev->hw_dev, "Programmed\n");
#endif
daqboard2000_resetLocalBus(dev);
daqboard2000_reloadPLX(dev);
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 19/29] Staging: comedi: fix printk issue in das1800.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (16 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 18/29] Staging: comedi: fix printk issue in daqboard2000.c Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 20/29] " Ravishankar karkala Mallikarjunayya
` (10 subsequent siblings)
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the das1800.c file that fixes up a
printk warning found by the checkpatch.pl tool.
Coverted printks to dev_<levels>.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/das1800.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c
index e89db9a..1ea9789 100644
--- a/drivers/staging/comedi/drivers/das1800.c
+++ b/drivers/staging/comedi/drivers/das1800.c
@@ -660,7 +660,7 @@ static int das1800_attach(struct comedi_device *dev,
board = das1800_probe(dev);
if (board < 0) {
- printk(" unable to determine board type\n");
+ dev_err(dev->hw_dev, "unable to determine board type\n");
return -ENODEV;
}
@@ -684,7 +684,8 @@ static int das1800_attach(struct comedi_device *dev,
if (irq) {
if (request_irq(irq, das1800_interrupt, 0,
driver_das1800.driver_name, dev)) {
- printk(" unable to allocate irq %u\n", irq);
+ dev_dbg(dev->hw_dev, "unable to allocate irq %u\n",
+ irq);
return -EINVAL;
}
}
@@ -713,7 +714,7 @@ static int das1800_attach(struct comedi_device *dev,
devpriv->irq_dma_bits |= 0x38;
break;
default:
- printk(" irq out of range\n");
+ dev_err(dev->hw_dev, "irq out of range\n");
return -EINVAL;
break;
}
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 20/29] Staging: comedi: fix printk issue in das1800.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (17 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 19/29] Staging: comedi: fix printk issue in das1800.c Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 21/29] Staging: comedi: fix printk issue in cb_pcidas.c Ravishankar karkala Mallikarjunayya
` (9 subsequent siblings)
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the das1800.c file that fixes up a
printk warning found by the checkpatch.pl tool.
Converted printks to dev_dbg().
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/das1800.c | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c
index 1ea9789..6ef3e8f 100644
--- a/drivers/staging/comedi/drivers/das1800.c
+++ b/drivers/staging/comedi/drivers/das1800.c
@@ -835,8 +835,8 @@ static int das1800_probe(struct comedi_device *dev)
case 0x3:
if (board == das1801st_da || board == das1802st_da ||
board == das1701st_da || board == das1702st_da) {
- printk(" Board model: %s\n",
- das1800_boards[board].name);
+ dev_dbg(dev->hw_dev, "Board model: %s\n",
+ das1800_boards[board].name);
return board;
}
printk
@@ -845,8 +845,8 @@ static int das1800_probe(struct comedi_device *dev)
break;
case 0x4:
if (board == das1802hr_da || board == das1702hr_da) {
- printk(" Board model: %s\n",
- das1800_boards[board].name);
+ dev_dbg(dev->hw_dev, "Board model: %s\n",
+ das1800_boards[board].name);
return board;
}
printk
@@ -856,8 +856,8 @@ static int das1800_probe(struct comedi_device *dev)
case 0x5:
if (board == das1801ao || board == das1802ao ||
board == das1701ao || board == das1702ao) {
- printk(" Board model: %s\n",
- das1800_boards[board].name);
+ dev_dbg(dev->hw_dev, "Board model: %s\n",
+ das1800_boards[board].name);
return board;
}
printk
@@ -866,18 +866,19 @@ static int das1800_probe(struct comedi_device *dev)
break;
case 0x6:
if (board == das1802hr || board == das1702hr) {
- printk(" Board model: %s\n",
- das1800_boards[board].name);
+ dev_dbg(dev->hw_dev, "Board model: %s\n",
+ das1800_boards[board].name);
return board;
}
- printk(" Board model (probed, not recommended): das-1802hr\n");
+ printk
+ (" Board model (probed, not recommended): das-1802hr\n");
return das1802hr;
break;
case 0x7:
if (board == das1801st || board == das1802st ||
board == das1701st || board == das1702st) {
- printk(" Board model: %s\n",
- das1800_boards[board].name);
+ dev_dbg(dev->hw_dev, "Board model: %s\n",
+ das1800_boards[board].name);
return board;
}
printk
@@ -886,8 +887,8 @@ static int das1800_probe(struct comedi_device *dev)
break;
case 0x8:
if (board == das1801hc || board == das1802hc) {
- printk(" Board model: %s\n",
- das1800_boards[board].name);
+ dev_dbg(dev->hw_dev, "Board model: %s\n",
+ das1800_boards[board].name);
return board;
}
printk
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 21/29] Staging: comedi: fix printk issue in cb_pcidas.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (18 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 20/29] " Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 22/29] " Ravishankar karkala Mallikarjunayya
` (8 subsequent siblings)
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the cb_pcidas.c file that fixes up a
printk warning found by the checkpatch.pl tool.
Converted printks to dev_dbg()..
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/cb_pcidas.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index 7433646..757c96a 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -773,8 +773,8 @@ static int cb_pcidas_detach(struct comedi_device *dev)
outl(INTCSR_INBOX_INTR_STATUS,
devpriv->s5933_config + AMCC_OP_REG_INTCSR);
#ifdef CB_PCIDAS_DEBUG
- printk("detaching, incsr is 0x%x\n",
- inl(devpriv->s5933_config + AMCC_OP_REG_INTCSR));
+ dev_dbg(dev->hw_dev, "detaching, incsr is 0x%x\n",
+ inl(devpriv->s5933_config + AMCC_OP_REG_INTCSR));
#endif
}
}
@@ -1276,7 +1276,7 @@ static int cb_pcidas_ai_cmd(struct comedi_device *dev,
outw(bits, devpriv->control_status + ADCMUX_CONT);
#ifdef CB_PCIDAS_DEBUG
- printk("comedi: sent 0x%x to adcmux control\n", bits);
+ dev_dbg(dev->hw_dev, "comedi: sent 0x%x to adcmux control\n", bits);
#endif
/* load counters */
@@ -1303,7 +1303,8 @@ static int cb_pcidas_ai_cmd(struct comedi_device *dev,
devpriv->adc_fifo_bits |= INT_FHF; /* interrupt fifo half full */
}
#ifdef CB_PCIDAS_DEBUG
- printk("comedi: adc_fifo_bits are 0x%x\n", devpriv->adc_fifo_bits);
+ dev_dbg(dev->hw_dev, "comedi: adc_fifo_bits are 0x%x\n",
+ devpriv->adc_fifo_bits);
#endif
/* enable (and clear) interrupts */
outw(devpriv->adc_fifo_bits | EOAI | INT | LADFUL,
@@ -1329,7 +1330,7 @@ static int cb_pcidas_ai_cmd(struct comedi_device *dev,
bits |= BURSTE;
outw(bits, devpriv->control_status + TRIG_CONTSTAT);
#ifdef CB_PCIDAS_DEBUG
- printk("comedi: sent 0x%x to trig control\n", bits);
+ dev_dbg(dev->hw_dev, "comedi: sent 0x%x to trig control\n", bits);
#endif
return 0;
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 22/29] Staging: comedi: fix printk issue in cb_pcidas.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (19 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 21/29] Staging: comedi: fix printk issue in cb_pcidas.c Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 23/29] Staging: comedi: fix printk issue in cb_pcidas64.c Ravishankar karkala Mallikarjunayya
` (7 subsequent siblings)
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the cb_pcidas.c file that fixes up a
printk warning found by the checkpatch.pl tool.
Converted printks to dev_<levels>..
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/cb_pcidas.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index 757c96a..7e4ffcf 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -855,7 +855,8 @@ static int ai_config_calibration_source(struct comedi_device *dev,
unsigned int source = data[1];
if (source >= num_calibration_sources) {
- printk("invalid calibration source: %i\n", source);
+ dev_err(dev->hw_dev, "invalid calibration source: %i\n",
+ source);
return -EINVAL;
}
@@ -1547,7 +1548,8 @@ static int cb_pcidas_ao_inttrig(struct comedi_device *dev,
spin_lock_irqsave(&dev->spinlock, flags);
devpriv->adc_fifo_bits |= DAEMIE | DAHFIE;
#ifdef CB_PCIDAS_DEBUG
- printk("comedi: adc_fifo_bits are 0x%x\n", devpriv->adc_fifo_bits);
+ dev_dbg(dev->hw_dev, "comedi: adc_fifo_bits are 0x%x\n",
+ devpriv->adc_fifo_bits);
#endif
/* enable and clear interrupts */
outw(devpriv->adc_fifo_bits | DAEMI | DAHFI,
@@ -1557,7 +1559,8 @@ static int cb_pcidas_ao_inttrig(struct comedi_device *dev,
devpriv->ao_control_bits |= DAC_START | DACEN | DAC_EMPTY;
outw(devpriv->ao_control_bits, devpriv->control_status + DAC_CSR);
#ifdef CB_PCIDAS_DEBUG
- printk("comedi: sent 0x%x to dac control\n", devpriv->ao_control_bits);
+ dev_dbg(dev->hw_dev, "comedi: sent 0x%x to dac control\n",
+ devpriv->ao_control_bits);
#endif
spin_unlock_irqrestore(&dev->spinlock, flags);
@@ -1585,8 +1588,9 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d)
s5933_status = inl(devpriv->s5933_config + AMCC_OP_REG_INTCSR);
#ifdef CB_PCIDAS_DEBUG
- printk("intcsr 0x%x\n", s5933_status);
- printk("mbef 0x%x\n", inl(devpriv->s5933_config + AMCC_OP_REG_MBEF));
+ dev_dbg(dev->hw_dev, "intcsr 0x%x\n", s5933_status);
+ dev_dbg(dev->hw_dev, "mbef 0x%x\n",
+ inl(devpriv->s5933_config + AMCC_OP_REG_MBEF));
#endif
if ((INTCSR_INTR_ASSERTED & s5933_status) == 0)
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 23/29] Staging: comedi: fix printk issue in cb_pcidas64.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (20 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 22/29] " Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 24/29] " Ravishankar karkala Mallikarjunayya
` (6 subsequent siblings)
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the cb_pcidas64.c file that fixes up a
printk warning found by the checkpatch.pl tool.
Converted printks to dev_<levels> and Removed unnecessary
printk statements.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/cb_pcidas64.c | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
index 1e32419..b68c587 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -1739,8 +1739,6 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
uint32_t local_range, local_decode;
int retval;
- printk("comedi%d: cb_pcidas64\n", dev->minor);
-
/*
* Allocate the private structure area.
*/
@@ -1781,12 +1779,11 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
return -EIO;
}
- printk("Found %s on bus %i, slot %i\n", board(dev)->name,
- pcidev->bus->number, PCI_SLOT(pcidev->devfn));
+ dev_dbg(dev->hw_dev, "Found %s on bus %i, slot %i\n", board(dev)->name,
+ pcidev->bus->number, PCI_SLOT(pcidev->devfn));
if (comedi_pci_enable(pcidev, driver_cb_pcidas.driver_name)) {
- printk(KERN_WARNING
- " failed to enable PCI device and request regions\n");
+ dev_warn(dev->hw_dev, "failed to enable PCI device and request regions\n");
return -EIO;
}
pci_set_master(pcidev);
@@ -1814,7 +1811,7 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (!priv(dev)->plx9080_iobase || !priv(dev)->main_iobase
|| !priv(dev)->dio_counter_iobase) {
- printk(" failed to remap io memory\n");
+ dev_warn(dev->hw_dev, "failed to remap io memory\n");
return -ENOMEM;
}
@@ -1850,17 +1847,19 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
priv(dev)->hw_revision =
hw_revision(dev, readw(priv(dev)->main_iobase + HW_STATUS_REG));
- printk(" stc hardware revision %i\n", priv(dev)->hw_revision);
+ dev_dbg(dev->hw_dev, "stc hardware revision %i\n",
+ priv(dev)->hw_revision);
init_plx9080(dev);
init_stc_registers(dev);
/* get irq */
if (request_irq(pcidev->irq, handle_interrupt, IRQF_SHARED,
"cb_pcidas64", dev)) {
- printk(" unable to allocate irq %u\n", pcidev->irq);
+ dev_dbg(dev->hw_dev, "unable to allocate irq %u\n",
+ pcidev->irq);
return -EINVAL;
}
dev->irq = pcidev->irq;
- printk(" irq %u\n", dev->irq);
+ dev_dbg(dev->hw_dev, "irq %u\n", dev->irq);
retval = setup_subdevices(dev);
if (retval < 0)
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 24/29] Staging: comedi: fix printk issue in cb_pcidas64.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (21 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 23/29] Staging: comedi: fix printk issue in cb_pcidas64.c Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 25/29] Staging: comedi: fix brace coding style issue in cb_pcidda.c Ravishankar karkala Mallikarjunayya
` (5 subsequent siblings)
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the cb_pcidas64.c file that fixes up a
printk warning found by the checkpatch.pl tool.
Converted printks to dev_<levels> and Removed unnecessary
printk statements.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/cb_pcidas64.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
index b68c587..c9e8c47 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -1881,8 +1881,6 @@ static int detach(struct comedi_device *dev)
{
unsigned int i;
- printk("comedi%d: cb_pcidas: remove\n", dev->minor);
-
if (dev->irq)
free_irq(dev->irq, dev);
if (priv(dev)) {
@@ -2092,7 +2090,8 @@ static int ai_config_calibration_source(struct comedi_device *dev,
else
num_calibration_sources = 8;
if (source >= num_calibration_sources) {
- printk("invalid calibration source: %i\n", source);
+ dev_dbg(dev->hw_dev, "invalid calibration source: %i\n",
+ source);
return -EINVAL;
}
@@ -2923,7 +2922,7 @@ static void pio_drain_ai_fifo_16(struct comedi_device *dev)
}
if (num_samples < 0) {
- printk(" cb_pcidas64: bug! num_samples < 0\n");
+ dev_err(dev->hw_dev, "cb_pcidas64: bug! num_samples < 0\n");
break;
}
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 25/29] Staging: comedi: fix brace coding style issue in cb_pcidda.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (22 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 24/29] " Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-14 0:38 ` Greg KH
2011-12-12 5:19 ` [PATCH 26/29] Staging: comedi: fix printk issue in das1800.c Ravishankar karkala Mallikarjunayya
` (4 subsequent siblings)
28 siblings, 1 reply; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the cb_pcidda.c file that fixes up a brace
warning found by the checkpatch.pl tool.
Converted printks to dev_dbg().
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/cb_pcidda.c | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c
index abba220..1bc52a8 100644
--- a/drivers/staging/comedi/drivers/cb_pcidda.c
+++ b/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -423,19 +423,19 @@ static int cb_pcidda_detach(struct comedi_device *dev)
static int cb_pcidda_ai_cmd(struct comedi_device *dev,
struct comedi_subdevice *s)
{
- printk("cb_pcidda_ai_cmd\n");
- printk("subdev: %d\n", cmd->subdev);
- printk("flags: %d\n", cmd->flags);
- printk("start_src: %d\n", cmd->start_src);
- printk("start_arg: %d\n", cmd->start_arg);
- printk("scan_begin_src: %d\n", cmd->scan_begin_src);
- printk("convert_src: %d\n", cmd->convert_src);
- printk("convert_arg: %d\n", cmd->convert_arg);
- printk("scan_end_src: %d\n", cmd->scan_end_src);
- printk("scan_end_arg: %d\n", cmd->scan_end_arg);
- printk("stop_src: %d\n", cmd->stop_src);
- printk("stop_arg: %d\n", cmd->stop_arg);
- printk("chanlist_len: %d\n", cmd->chanlist_len);
+ dev_dbg(dev->hw_dev, "cb_pcidda_ai_cmd\n");
+ dev_dbg(dev->hw_dev, "subdev: %d\n", cmd->subdev);
+ dev_dbg(dev->hw_dev, "flags: %d\n", cmd->flags);
+ dev_dbg(dev->hw_dev, "start_src: %d\n", cmd->start_src);
+ dev_dbg(dev->hw_dev, "start_arg: %d\n", cmd->start_arg);
+ dev_dbg(dev->hw_dev, "scan_begin_src: %d\n", cmd->scan_begin_src);
+ dev_dbg(dev->hw_dev, "convert_src: %d\n", cmd->convert_src);
+ dev_dbg(dev->hw_dev, "convert_arg: %d\n", cmd->convert_arg);
+ dev_dbg(dev->hw_dev, "scan_end_src: %d\n", cmd->scan_end_src);
+ dev_dbg(dev->hw_dev, "scan_end_arg: %d\n", cmd->scan_end_arg);
+ dev_dbg(dev->hw_dev, "stop_src: %d\n", cmd->stop_src);
+ dev_dbg(dev->hw_dev, "stop_arg: %d\n", cmd->stop_arg);
+ dev_dbg(dev->hw_dev, "chanlist_len: %d\n", cmd->chanlist_len);
}
#endif
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 26/29] Staging: comedi: fix printk issue in das1800.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (23 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 25/29] Staging: comedi: fix brace coding style issue in cb_pcidda.c Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 27/29] " Ravishankar karkala Mallikarjunayya
` (3 subsequent siblings)
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the das1800.c file that fixes up a
printk warning found by the checkpatch.pl tool.
Included KERN_facility levels for printk.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/das1800.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c
index 6ef3e8f..3ca751c 100644
--- a/drivers/staging/comedi/drivers/das1800.c
+++ b/drivers/staging/comedi/drivers/das1800.c
@@ -632,17 +632,17 @@ static int das1800_attach(struct comedi_device *dev,
if (alloc_private(dev, sizeof(struct das1800_private)) < 0)
return -ENOMEM;
- printk("comedi%d: %s: io 0x%lx", dev->minor, driver_das1800.driver_name,
- iobase);
+ printk(KERN_DEBUG "comedi%d: %s: io 0x%lx", dev->minor,
+ driver_das1800.driver_name, iobase);
if (irq) {
- printk(", irq %u", irq);
+ printk(KERN_CONT ", irq %u", irq);
if (dma0) {
- printk(", dma %u", dma0);
+ printk(KERN_CONT ", dma %u", dma0);
if (dma1)
- printk(" and %u", dma1);
+ printk(KERN_CONT " and %u", dma1);
}
}
- printk("\n");
+ printk(KERN_CONT "\n");
if (iobase == 0) {
printk(" io base address required\n");
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 27/29] Staging: comedi: fix printk issue in das1800.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (24 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 26/29] Staging: comedi: fix printk issue in das1800.c Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 28/29] Staging: comedi: fix printk issue in contec_pci_dio.c Ravishankar karkala Mallikarjunayya
` (2 subsequent siblings)
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the das1800.c file that fixes up a
printk warning found by the checkpatch.pl tool.
Converted printk to dev_<levels>.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/das1800.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c
index 3ca751c..99ada5a 100644
--- a/drivers/staging/comedi/drivers/das1800.c
+++ b/drivers/staging/comedi/drivers/das1800.c
@@ -573,9 +573,9 @@ static int das1800_init_dma(struct comedi_device *dev, unsigned int dma0,
devpriv->dma_bits |= DMA_CH7_CH5;
break;
default:
- printk(" only supports dma channels 5 through 7\n"
- " Dual dma only allows the following combinations:\n"
- " dma 5,6 / 6,7 / or 7,5\n");
+ dev_err(dev->hw_dev, " only supports dma channels 5 through 7\n"
+ " Dual dma only allows the following combinations:\n"
+ " dma 5,6 / 6,7 / or 7,5\n");
return -EINVAL;
break;
}
@@ -645,7 +645,7 @@ static int das1800_attach(struct comedi_device *dev,
printk(KERN_CONT "\n");
if (iobase == 0) {
- printk(" io base address required\n");
+ dev_err(dev->hw_dev, "io base address required\n");
return -EINVAL;
}
@@ -815,8 +815,8 @@ static int das1800_detach(struct comedi_device *dev)
kfree(devpriv->ai_buf1);
}
- printk("comedi%d: %s: remove\n", dev->minor,
- driver_das1800.driver_name);
+ dev_dbg(dev->hw_dev, "comedi%d: %s: remove\n", dev->minor,
+ driver_das1800.driver_name);
return 0;
};
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 28/29] Staging: comedi: fix printk issue in contec_pci_dio.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (25 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 27/29] " Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-12 5:19 ` [PATCH 29/29] " Ravishankar karkala Mallikarjunayya
2011-12-14 1:35 ` [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ryan Mallon
28 siblings, 0 replies; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the contec_pci_dio.c file that fixes up a
printk warning found by the checkpatch.pl tool.
Converted printks to dev_dbg().
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/contec_pci_dio.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c
index db73638..e3659bd 100644
--- a/drivers/staging/comedi/drivers/contec_pci_dio.c
+++ b/drivers/staging/comedi/drivers/contec_pci_dio.c
@@ -196,8 +196,8 @@ static int contec_do_insn_bits(struct comedi_device *dev,
struct comedi_insn *insn, unsigned int *data)
{
- printk("contec_do_insn_bits called\n");
- printk(" data: %d %d\n", data[0], data[1]);
+ dev_dbg(dev->hw_dev, "contec_do_insn_bits called\n");
+ dev_dbg(dev->hw_dev, "data: %d %d\n", data[0], data[1]);
if (insn->n != 2)
return -EINVAL;
@@ -205,8 +205,8 @@ static int contec_do_insn_bits(struct comedi_device *dev,
if (data[0]) {
s->state &= ~data[0];
s->state |= data[0] & data[1];
- printk(" out: %d on %lx\n", s->state,
- dev->iobase + thisboard->out_offs);
+ dev_dbg(dev->hw_dev, "out: %d on %lx\n", s->state,
+ dev->iobase + thisboard->out_offs);
outw(s->state, dev->iobase + thisboard->out_offs);
}
return 2;
@@ -217,8 +217,8 @@ static int contec_di_insn_bits(struct comedi_device *dev,
struct comedi_insn *insn, unsigned int *data)
{
- printk("contec_di_insn_bits called\n");
- printk(" data: %d %d\n", data[0], data[1]);
+ dev_dbg(dev->hw_dev, "contec_di_insn_bits called\n");
+ dev_dbg(dev->hw_dev, "data: %d %d\n", data[0], data[1]);
if (insn->n != 2)
return -EINVAL;
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* [PATCH 29/29] Staging: comedi: fix printk issue in contec_pci_dio.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (26 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 28/29] Staging: comedi: fix printk issue in contec_pci_dio.c Ravishankar karkala Mallikarjunayya
@ 2011-12-12 5:19 ` Ravishankar karkala Mallikarjunayya
2011-12-14 0:48 ` Greg KH
2011-12-14 1:35 ` [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ryan Mallon
28 siblings, 1 reply; 35+ messages in thread
From: Ravishankar karkala Mallikarjunayya @ 2011-12-12 5:19 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar karkala Mallikarjunayya
This is a patch to the contec_pci_dio.c file that fixes up a
printk warning found by the checkpatch.pl tool.
Converted printks to dev_<levels> and Removed unnecessary
printk statements.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/contec_pci_dio.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c
index e3659bd..a3231fe 100644
--- a/drivers/staging/comedi/drivers/contec_pci_dio.c
+++ b/drivers/staging/comedi/drivers/contec_pci_dio.c
@@ -105,8 +105,6 @@ static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it)
struct pci_dev *pcidev = NULL;
struct comedi_subdevice *s;
- printk("comedi%d: contec: ", dev->minor);
-
dev->board_name = thisboard->name;
if (alloc_private(dev, sizeof(struct contec_private)) < 0)
@@ -132,7 +130,7 @@ static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return -EIO;
}
dev->iobase = pci_resource_start(pcidev, 0);
- printk(" base addr %lx ", dev->iobase);
+ dev_dbg("base addr %lx\n", dev->iobase);
dev->board_ptr = contec_boards + 0;
@@ -153,20 +151,18 @@ static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->range_table = &range_digital;
s->insn_bits = contec_do_insn_bits;
- printk("attached\n");
return 1;
}
}
- printk("card not present!\n");
+ dev_err(dev->hw_dev, "card not present!\n");
return -EIO;
}
static int contec_detach(struct comedi_device *dev)
{
- printk("comedi%d: contec: remove\n", dev->minor);
if (devpriv && devpriv->pci_dev) {
if (dev->iobase)
--
1.7.0.4
^ permalink raw reply [flat|nested] 35+ messages in thread* Re: [PATCH 29/29] Staging: comedi: fix printk issue in contec_pci_dio.c
2011-12-12 5:19 ` [PATCH 29/29] " Ravishankar karkala Mallikarjunayya
@ 2011-12-14 0:48 ` Greg KH
0 siblings, 0 replies; 35+ messages in thread
From: Greg KH @ 2011-12-14 0:48 UTC (permalink / raw)
To: Ravishankar karkala Mallikarjunayya; +Cc: gregkh, wfp5p, devel, linux-kernel
On Mon, Dec 12, 2011 at 10:49:41AM +0530, Ravishankar karkala Mallikarjunayya wrote:
> This is a patch to the contec_pci_dio.c file that fixes up a
> printk warning found by the checkpatch.pl tool.
>
> Converted printks to dev_<levels> and Removed unnecessary
> printk statements.
You forgot to add to the changelog entry this text:
Breaks the build.
which would have saved me a lot of time tracking down the patch in this
series that was causing problems.
{sigh}
Your next patch series better come with perfectly spelled changelog
entries that actually describe what the patches do, numbered properly
(none of this 30/30 crap after a 00/29 series), not break the build (is
that asking too much?) apply with no fuzz, and to help it all out, a
home made holiday bread of your choosing, as long as it's fresh, and
does not contain dried fruit bits (soaked in liquor can't hurt either.)
Otherwise I'm very tempted to just add you to my kill file, it would
save me lots of time and frustration, and likewise, I'm sure yours as
well.
Get baking,
greg k-h
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c
2011-12-12 5:19 [PATCH 01/29] Staging: comedi: fix printk issue in dt3000.c Ravishankar karkala Mallikarjunayya
` (27 preceding siblings ...)
2011-12-12 5:19 ` [PATCH 29/29] " Ravishankar karkala Mallikarjunayya
@ 2011-12-14 1:35 ` Ryan Mallon
28 siblings, 0 replies; 35+ messages in thread
From: Ryan Mallon @ 2011-12-14 1:35 UTC (permalink / raw)
To: Ravishankar karkala Mallikarjunayya; +Cc: gregkh, wfp5p, devel, linux-kernel
On 12/12/11 16:19, Ravishankar karkala Mallikarjunayya wrote:
> This is a patch to the dt3000.c file that fixes up a
> printk warning found by the checkpatch.pl tool.
>
> Converted printks to dev_<levels>.
>
> Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
There are still numerous issues with these patches, some which have been
pointed out to you several times now and still exist:
- You are using printk/pr_info, etc where dev_info, etc should be used
- You are converting some KERN_CONT to multiline dev_info, and in doing
so are now printing useless strings.
- Some of the printk's you are 'fixing' should just get removed. Don't
blindly replace things, it just creates churn.
- You are converting some printks to dev_dbg and leaving dev->minor in
the string which is no longer needed.
- There are some subtle format changes introduced by the printk
changes. Not a big deal, but it should be noted in the changelog. It
might affect some userspace tools for the comedi drivers?
- You have multiple patches which do the same thing. Why are there two
patches for converting printk -> dev_dbg in das1800.c for example? Why
not do all of the conversion changes for one file in a single patch?
- Some of your patches don't do what they say they do.
- You have compile errors still.
Some these patches probably are worth applying, but they are just lost
in the noise.
~Ryan
^ permalink raw reply [flat|nested] 35+ messages in thread