[PATCH] Staging: comedi: fix printk issue in adv_pci1710.c

[PATCH] Staging: comedi: fix printk issue in adv_pci1710.c

[Ravishankar]

From: Ravishankar <ravi.shankar@greenturtles.in>

This is a patch to the adv_pci1710.c file that fixes up a printk warning found by the checkpatch.pl tool

Signed-off-by: Ravishankar <ravishankarkm32@gmal.com>
---
 drivers/staging/comedi/drivers/adv_pci1710.c |   28 +++++++++++++-------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index da2b75b..e6c0f06 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -1382,14 +1382,13 @@ static int pci1710_attach(struct comedi_device *dev,
 	int i;
 	int board_index;
 
-	printk("comedi%d: adv_pci1710: ", dev->minor);
+	pr_info("comedi%d: adv_pci1710: ", dev->minor);
 
 	opt_bus = it->options[0];
 	opt_slot = it->options[1];
 
 	ret = alloc_private(dev, sizeof(struct pci1710_private));
 	if (ret < 0) {
-		printk(" - Allocation failed!\n");
 		return -ENOMEM;
 	}
 
@@ -1436,10 +1435,13 @@ static int pci1710_attach(struct comedi_device *dev,
 
 	if (!pcidev) {
 		if (opt_bus || opt_slot) {
-			printk(" - Card at b:s %d:%d %s\n",
-			       opt_bus, opt_slot, errstr);
+			pr_cont("\n");
+			pr_err("comedi%d: adv_pci1710: Card at b:s %d:%d %s\n",
+					dev->minor, opt_bus, opt_slot, errstr);
 		} else {
-			printk(" - Card %s\n", errstr);
+			pr_cont("\n");
+			pr_err("comedi%d: adv_pci1710: Card %s\n", dev->minor,
+					errstr);
 		}
 		return -EIO;
 	}
@@ -1450,8 +1452,8 @@ static int pci1710_attach(struct comedi_device *dev,
 	irq = pcidev->irq;
 	iobase = pci_resource_start(pcidev, 2);
 
-	printk(", b:s:f=%d:%d:%d, io=0x%4lx", pci_bus, pci_slot, pci_func,
-	       iobase);
+	pr_cont(", b:s:f=%d:%d:%d, io=0x%4lx", pci_bus, pci_slot, pci_func,
+			iobase);
 
 	dev->iobase = iobase;
 
@@ -1472,7 +1474,6 @@ static int pci1710_attach(struct comedi_device *dev,
 
 	ret = alloc_subdevices(dev, n_subdevices);
 	if (ret < 0) {
-		printk(" - Allocation failed!\n");
 		return ret;
 	}
 
@@ -1483,15 +1484,14 @@ static int pci1710_attach(struct comedi_device *dev,
 			if (request_irq(irq, interrupt_service_pci1710,
 					IRQF_SHARED, "Advantech PCI-1710",
 					dev)) {
-				printk
-				    (", unable to allocate IRQ %d, DISABLING IT",
-				     irq);
+				pr_info(", unable to allocate IRQ %d, DISABLING IT",
+						irq);
 				irq = 0;	/* Can't use IRQ */
 			} else {
-				printk(", irq=%u", irq);
+				pr_cont(", irq=%u", irq);
 			}
 		} else {
-			printk(", IRQ disabled");
+			pr_cont(", IRQ disabled");
 		}
 	} else {
 		irq = 0;
@@ -1499,7 +1499,7 @@ static int pci1710_attach(struct comedi_device *dev,
 
 	dev->irq = irq;
 
-	printk(".\n");
+	pr_cont(".\n");
 
 	subdev = 0;
 
-- 
1.7.6

Re: [PATCH] Staging: comedi: fix printk issue in adv_pci1710.c

[Greg KH]

On Fri, Aug 19, 2011 at 09:44:28AM -0400, Ravishankar wrote:
> From: Ravishankar <ravi.shankar@greenturtles.in>
> 
> This is a patch to the adv_pci1710.c file that fixes up a printk warning found by the checkpatch.pl tool
> 
> Signed-off-by: Ravishankar <ravishankarkm32@gmal.com>

Due to the huge number of different revisions of your patches, and the
lack of any response from you based on the review comments except to
send more patches, I've dropped everything from you that was in my
to-apply queue.

Can you please resend everything that I have not applied, that is still
applicable, after handling the review comments of the numerous people
who took their time to try to help you out here?  To ignore them is not
nice at all.

thanks,

greg k-h

[PATCH] Staging: comedi: fix printk() issue in adv_pci1710.c

[Ravishankar]

From: Ravishankar <ravi.shankar@greenturtles.in>

This is a patch to the adv_pci1710.c file that fixes up a printk() warning found by the checkpatch.pl tool

Signed-off-by: Ravishankar <ravishankarkm32@gmail.com>
---
 Converted printks to pr_<levels>
 drivers/staging/comedi/drivers/adv_pci1710.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index da2b75b..2ae98a7 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -925,14 +925,14 @@ static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device *dev,
 */
 static void pci171x_cmdtest_out(int e, struct comedi_cmd *cmd)
 {
-	printk("adv_pci1710 e=%d startsrc=%x scansrc=%x convsrc=%x\n", e,
-	       cmd->start_src, cmd->scan_begin_src, cmd->convert_src);
-	printk("adv_pci1710 e=%d startarg=%d scanarg=%d convarg=%d\n", e,
-	       cmd->start_arg, cmd->scan_begin_arg, cmd->convert_arg);
-	printk("adv_pci1710 e=%d stopsrc=%x scanend=%x\n", e, cmd->stop_src,
-	       cmd->scan_end_src);
-	printk("adv_pci1710 e=%d stoparg=%d scanendarg=%d chanlistlen=%d\n",
-	       e, cmd->stop_arg, cmd->scan_end_arg, cmd->chanlist_len);
+	pr_debug("adv_pci1710 e=%d startsrc=%x scansrc=%x convsrc=%x\n", e,
+			cmd->start_src, cmd->scan_begin_src, cmd->convert_src);
+	pr_debug("adv_pci1710 e=%d startarg=%d scanarg=%d convarg=%d\n", e,
+			cmd->start_arg, cmd->scan_begin_arg, cmd->convert_arg);
+	pr_debug("adv_pci1710 e=%d stopsrc=%x scanend=%x\n", e, cmd->stop_src,
+			cmd->scan_end_src);
+	pr_debug("adv_pci1710 e=%d stoparg=%d scanendarg=%d chanlistlen=%d\n",
+			e, cmd->stop_arg, cmd->scan_end_arg, cmd->chanlist_len);
 }
 #endif
 
-- 
1.6.5.2