staging/comedi: Use dev_ printks in drivers/vmk80xx.c

PATCH In review YAMANE Toshiaki 3 participants 6 messages Oct 14, 2012 – Oct 24, 2012 Staging

Share & tools

YAMANE Toshiaki

author

2012-10-14 13:41 UTC #0 lore raw

PATCH 1/1 staging/comedi: Use dev_ printks in drivers/vmk80xx.c

fixed below checkpatch warning.
- Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(... to printk(KERN_INFO ...

Signed-off-by YAMANE Toshiaki <[email protected]>

---
 drivers/staging/comedi/drivers/vmk80xx.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

drivers/staging/comedi/drivers/vmk80xx.c +7 -7

index df277aa..3e77d40 100644
@@ -1371,12 +1371,12 @@ static int vmk80xx_usb_probe(struct usb_interface *intf,
 
 	if (dev->board.model == VMK8061_MODEL) {
 		vmk80xx_read_eeprom(dev, IC3_VERSION);
-		printk(KERN_INFO "comedi#: vmk80xx: %s\n", dev->fw.ic3_vers);
+		dev_info(&intf->dev, "%s: %s\n", __FILE__, dev->fw.ic3_vers);
 
 		if (vmk80xx_check_data_link(dev)) {
 			vmk80xx_read_eeprom(dev, IC6_VERSION);
-			printk(KERN_INFO "comedi#: vmk80xx: %s\n",
-			       dev->fw.ic6_vers);
+			dev_info(&intf->dev, "%s: %s\n",
+				 __FILE__, dev->fw.ic6_vers);
 		} else {
 			dbgcm("comedi#: vmk80xx: no conn. to CPU\n");
 		}

@@ -1387,8 +1387,8 @@ static int vmk80xx_usb_probe(struct usb_interface *intf,
 
 	dev->probed = 1;
 
-	printk(KERN_INFO "comedi#: vmk80xx: board #%d [%s] now attached\n",
-	       dev->count, dev->board.name);
+	dev_info(&intf->dev, "%s: board #%d [%s] now attached\n",
+		 __FILE__, dev->count, dev->board.name);
 
 	mutex_unlock(&glb_mutex);

@@ -1422,8 +1422,8 @@ static void vmk80xx_usb_disconnect(struct usb_interface *intf)
 	kfree(dev->usb_rx_buf);
 	kfree(dev->usb_tx_buf);
 
-	printk(KERN_INFO "comedi#: vmk80xx: board #%d [%s] now detached\n",
-	       dev->count, dev->board.name);
+	dev_info(&intf->dev, "%s: board #%d [%s] now detached\n",
+		 __FILE__, dev->count, dev->board.name);
 
 	up(&dev->limit_sem);
 	mutex_unlock(&glb_mutex);

Signature · 1 line

1.7.9.5

Ian Abbott

2012-10-15 09:20 UTC #1 lore raw

Quoted 13 lines · YAMANE Toshiaki

fixed below checkpatch warning.
- Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(... to printk(KERN_INFO ...
Signed-off-by YAMANE Toshiaki <[email protected]>
---
 drivers/staging/comedi/drivers/vmk80xx.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/staging/comedi/drivers/vmk80xx.c +0 -0
index df277aa..3e77d40 100644

drivers/staging/comedi/drivers/vmk80xx.c static int vmk80xx_usb_probe(struct usb_interface *intf, · line 1374

Quoted 5 lines

drivers/staging/comedi/drivers/vmk80xx.c +1 -1

@@ -1371,12 +1371,12 @@ static int vmk80xx_usb_probe(struct usb_interface *intf,
 
 	if (dev->board.model == VMK8061_MODEL) {
 		vmk80xx_read_eeprom(dev, IC3_VERSION);
-		printk(KERN_INFO "comedi#: vmk80xx: %s\n", dev->fw.ic3_vers);
+		dev_info(&intf->dev, "%s: %s\n", __FILE__, dev->fw.ic3_vers);

I think __FILE__ is the wrong thing to use in these logs. Better to use vmk80xx or perhaps KBUILD_MODNAME.

Quoted 33 lines

drivers/staging/comedi/drivers/vmk80xx.c +6 -6

 		if (vmk80xx_check_data_link(dev)) {
 			vmk80xx_read_eeprom(dev, IC6_VERSION);
-			printk(KERN_INFO "comedi#: vmk80xx: %s\n",
-			       dev->fw.ic6_vers);
+			dev_info(&intf->dev, "%s: %s\n",
+				 __FILE__, dev->fw.ic6_vers);
 		} else {
 			dbgcm("comedi#: vmk80xx: no conn. to CPU\n");
 		}

@@ -1387,8 +1387,8 @@ static int vmk80xx_usb_probe(struct usb_interface *intf,
 
 	dev->probed = 1;
 
-	printk(KERN_INFO "comedi#: vmk80xx: board #%d [%s] now attached\n",
-	       dev->count, dev->board.name);
+	dev_info(&intf->dev, "%s: board #%d [%s] now attached\n",
+		 __FILE__, dev->count, dev->board.name);
 
 	mutex_unlock(&glb_mutex);

@@ -1422,8 +1422,8 @@ static void vmk80xx_usb_disconnect(struct usb_interface *intf)
 	kfree(dev->usb_rx_buf);
 	kfree(dev->usb_tx_buf);
 
-	printk(KERN_INFO "comedi#: vmk80xx: board #%d [%s] now detached\n",
-	       dev->count, dev->board.name);
+	dev_info(&intf->dev, "%s: board #%d [%s] now detached\n",
+		 __FILE__, dev->count, dev->board.name);
 
 	up(&dev->limit_sem);
 	mutex_unlock(&glb_mutex);

Signature · 2 lines

-=( Ian Abbott @ MEV Ltd.    E-mail: <[email protected]>             )=-
-=( Tel: +44 (0)161 477 1898   FAX: +44 (0)161 718 3587              )=-

YAMANE Toshiaki

author

2012-10-15 10:58 UTC #2 lore raw

PATCH 1/1 staging/comedi: Use dev_ printks in drivers/vmk80xx.c

fixed below checkpatch warning.
- Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(... to printk(KERN_INFO ...

Signed-off-by YAMANE Toshiaki <[email protected]>

---
 drivers/staging/comedi/drivers/vmk80xx.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

drivers/staging/comedi/drivers/vmk80xx.c +7 -7

index df277aa..3df4fcf 100644
@@ -1371,12 +1371,12 @@ static int vmk80xx_usb_probe(struct usb_interface *intf,
 
 	if (dev->board.model == VMK8061_MODEL) {
 		vmk80xx_read_eeprom(dev, IC3_VERSION);
-		printk(KERN_INFO "comedi#: vmk80xx: %s\n", dev->fw.ic3_vers);
+		dev_info(&intf->dev, "vmk80xx: %s\n", dev->fw.ic3_vers);
 
 		if (vmk80xx_check_data_link(dev)) {
 			vmk80xx_read_eeprom(dev, IC6_VERSION);
-			printk(KERN_INFO "comedi#: vmk80xx: %s\n",
-			       dev->fw.ic6_vers);
+			dev_info(&intf->dev, "vmk80xx: %s\n",
+				 dev->fw.ic6_vers);
 		} else {
 			dbgcm("comedi#: vmk80xx: no conn. to CPU\n");
 		}

@@ -1387,8 +1387,8 @@ static int vmk80xx_usb_probe(struct usb_interface *intf,
 
 	dev->probed = 1;
 
-	printk(KERN_INFO "comedi#: vmk80xx: board #%d [%s] now attached\n",
-	       dev->count, dev->board.name);
+	dev_info(&intf->dev, "vmk80xx: board #%d [%s] now attached\n",
+		 dev->count, dev->board.name);
 
 	mutex_unlock(&glb_mutex);

@@ -1422,8 +1422,8 @@ static void vmk80xx_usb_disconnect(struct usb_interface *intf)
 	kfree(dev->usb_rx_buf);
 	kfree(dev->usb_tx_buf);
 
-	printk(KERN_INFO "comedi#: vmk80xx: board #%d [%s] now detached\n",
-	       dev->count, dev->board.name);
+	dev_info(&intf->dev, "vmk80xx: board #%d [%s] now detached\n",
+		 dev->count, dev->board.name);
 
 	up(&dev->limit_sem);
 	mutex_unlock(&glb_mutex);

Signature · 1 line

1.7.9.5

Greg Kroah-Hartman

2012-10-22 19:45 UTC #3 lore raw

drivers/staging/comedi/drivers/vmk80xx.c static int vmk80xx_usb_probe(struct usb_interface *intf, · line 1391

Quoted 4 lines · YAMANE Toshiaki

drivers/staging/comedi/drivers/vmk80xx.c +2 -2

-	printk(KERN_INFO "comedi#: vmk80xx: board #%d [%s] now attached\n",
-	       dev->count, dev->board.name);
+	dev_info(&intf->dev, "vmk80xx: board #%d [%s] now attached\n",
+		 dev->count, dev->board.name);

The vmk80xx here is redundant, as it shows up from the dev_info() printk. Care to fix the two places here you did that and resend?

Note, when you resend please enumerate what version of the patch this is, otherwise I can get very confused.

thanks,

greg k-h

Toshiaki Yamane

author

2012-10-24 03:14 UTC #4 lore raw

Quoted 2 lines · Greg Kroah-Hartman

Note, when you resend please enumerate what version of the patch this is, otherwise I can get very confused.

Sorry, I am going to watch out for it from the next.

Signature · 3 lines

Regards,

YAMANE Toshiaki

YAMANE Toshiaki

author

2012-10-24 05:22 UTC #5 lore raw

PATCH v2 1/1 staging/comedi: Use dev_ printks in drivers/vmk80xx.c

In reply to Greg Kroah-Hartman

fixed below checkpatch warning.
- Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(... to printk(KERN_INFO ...

Signed-off-by YAMANE Toshiaki <[email protected]>

---
 drivers/staging/comedi/drivers/vmk80xx.c |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

drivers/staging/comedi/drivers/vmk80xx.c +6 -7

index df277aa..3664907 100644
@@ -1371,12 +1371,11 @@ static int vmk80xx_usb_probe(struct usb_interface *intf,
 
 	if (dev->board.model == VMK8061_MODEL) {
 		vmk80xx_read_eeprom(dev, IC3_VERSION);
-		printk(KERN_INFO "comedi#: vmk80xx: %s\n", dev->fw.ic3_vers);
+		dev_info(&intf->dev, "%s\n", dev->fw.ic3_vers);
 
 		if (vmk80xx_check_data_link(dev)) {
 			vmk80xx_read_eeprom(dev, IC6_VERSION);
-			printk(KERN_INFO "comedi#: vmk80xx: %s\n",
-			       dev->fw.ic6_vers);
+			dev_info(&intf->dev, "%s\n", dev->fw.ic6_vers);
 		} else {
 			dbgcm("comedi#: vmk80xx: no conn. to CPU\n");
 		}

@@ -1387,8 +1386,8 @@ static int vmk80xx_usb_probe(struct usb_interface *intf,
 
 	dev->probed = 1;
 
-	printk(KERN_INFO "comedi#: vmk80xx: board #%d [%s] now attached\n",
-	       dev->count, dev->board.name);
+	dev_info(&intf->dev, "board #%d [%s] now attached\n",
+		 dev->count, dev->board.name);
 
 	mutex_unlock(&glb_mutex);

@@ -1422,8 +1421,8 @@ static void vmk80xx_usb_disconnect(struct usb_interface *intf)
 	kfree(dev->usb_rx_buf);
 	kfree(dev->usb_tx_buf);
 
-	printk(KERN_INFO "comedi#: vmk80xx: board #%d [%s] now detached\n",
-	       dev->count, dev->board.name);
+	dev_info(&intf->dev, "board #%d [%s] now detached\n",
+		 dev->count, dev->board.name);
 
 	up(&dev->limit_sem);
 	mutex_unlock(&glb_mutex);

Signature · 1 line

1.7.9.5