USB: remove info() macro from usb input drivers

PATCH In review Greg KH 4 participants 5 messages Oct 10, 2008 2 messages not in the archive

Subsystems (3)

HID Input drivers Yealink phone driver

lore

Share & tools

lore

Greg KH

author

2008-10-10 05:21 UTC #0 lore raw

PATCH 1/1 USB: remove info() macro from usb input drivers

From: Greg Kroah-Hartman <[email protected]>

USB should not be having it's own printk macros, so remove info() and use the system-wide standard of dev_info() wherever possible.

Cc Dmitry Torokhov <[email protected]>

Signed-off-by Greg Kroah-Hartman <[email protected]>

---
Dmitry, this has been in the USB tree for a few months now, sorry for not sending it to you sooner. I can easily keep it in my tree and send it to Linus for this merge if you want me to, or you can take it in your tree, which ever you want me to do.

thanks,

greg k-h

 drivers/input/joystick/xpad.c    |    2 +-
 drivers/input/misc/ati_remote.c  |    6 ++++--
 drivers/input/misc/yealink.c     |    3 ++-
 drivers/input/tablet/acecad.c    |    3 ++-
 drivers/input/tablet/aiptek.c    |   13 ++++++++-----
 drivers/input/tablet/gtco.c      |    4 ++--
 drivers/input/tablet/kbtab.c     |    3 ++-
 drivers/input/tablet/wacom_sys.c |    3 ++-
 8 files changed, 23 insertions(+), 14 deletions(-)

drivers/input/joystick/xpad.c +1 -1

@@ -911,7 +911,7 @@ static int __init usb_xpad_init(void)
 {
 	int result = usb_register(&xpad_driver);
 	if (result == 0)
-		info(DRIVER_DESC);
+		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
 	return result;
 }

drivers/input/misc/ati_remote.c +4 -2

@@ -834,9 +834,11 @@ static int __init ati_remote_init(void)
 
 	result = usb_register(&ati_remote_driver);
 	if (result)
-		err("usb_register error #%d\n", result);
+		printk(KERN_ERR KBUILD_MODNAME
+		       ": usb_register error #%d\n", result);
 	else
-		info("Registered USB driver " DRIVER_DESC " v. " DRIVER_VERSION);
+		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+		       DRIVER_DESC "\n");
 
 	return result;
 }

drivers/input/misc/yealink.c +2 -1

@@ -999,7 +999,8 @@ static int __init yealink_dev_init(void)
 {
 	int ret = usb_register(&yealink_driver);
 	if (ret == 0)
-		info(DRIVER_DESC ":" DRIVER_VERSION);
+		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+		       DRIVER_DESC "\n");
 	return ret;
 }

drivers/input/tablet/acecad.c +2 -1

@@ -280,7 +280,8 @@ static int __init usb_acecad_init(void)
 {
 	int result = usb_register(&usb_acecad_driver);
 	if (result == 0)
-		info(DRIVER_VERSION ":" DRIVER_DESC);
+		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+		       DRIVER_DESC "\n");
 	return result;
 }

drivers/input/tablet/aiptek.c +8 -5

@@ -1821,8 +1821,9 @@ aiptek_probe(struct usb_interface *intf,
 		aiptek->curSetting.programmableDelay = speeds[i];
 		(void)aiptek_program_tablet(aiptek);
 		if (aiptek->inputdev->absmax[ABS_X] > 0) {
-			info("input: Aiptek using %d ms programming speed\n",
-			     aiptek->curSetting.programmableDelay);
+			dev_info(&intf->dev,
+				 "Aiptek using %d ms programming speed\n",
+				 aiptek->curSetting.programmableDelay);
 			break;
 		}
 	}

@@ -1830,7 +1831,8 @@ aiptek_probe(struct usb_interface *intf,
 	/* Murphy says that some day someone will have a tablet that fails the
 	   above test. That's you, Frederic Rodrigo */
 	if (i == ARRAY_SIZE(speeds)) {
-		info("input: Aiptek tried all speeds, no sane response");
+		dev_info(&intf->dev,
+			 "Aiptek tried all speeds, no sane response\n");
 		goto fail2;
 	}

@@ -1902,8 +1904,9 @@ static int __init aiptek_init(void)
 {
 	int result = usb_register(&aiptek_driver);
 	if (result == 0) {
-		info(DRIVER_VERSION ": " DRIVER_AUTHOR);
-		info(DRIVER_DESC);
+		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+		       DRIVER_DESC "\n");
+		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_AUTHOR "\n");
 	}
 	return result;
 }

drivers/input/tablet/gtco.c +2 -2

@@ -2,7 +2,7 @@
 
 GTCO digitizer USB driver
 
-Use the err(), dbg() and info() macros from usb.h for system logging
+Use the err() and dbg() macros from usb.h for system logging
 
 TO CHECK:  Is pressure done right on report 5?

@@ -1010,7 +1010,7 @@ static void gtco_disconnect(struct usb_i
 		kfree(gtco);
 	}
 
-	info("gtco driver disconnected");
+	dev_info(&interface->dev, "gtco driver disconnected\n");
 }
 
 /*   STANDARD MODULE LOAD ROUTINES  */

drivers/input/tablet/kbtab.c +2 -1

@@ -215,7 +215,8 @@ static int __init kbtab_init(void)
 	retval = usb_register(&kbtab_driver);
 	if (retval)
 		goto out;
-	info(DRIVER_VERSION ":" DRIVER_DESC);
+	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+	       DRIVER_DESC "\n");
 out:
 	return retval;
 }

drivers/input/tablet/wacom_sys.c +2 -1

@@ -385,7 +385,8 @@ static int __init wacom_init(void)
 	wacom_driver.id_table = get_device_table();
 	result = usb_register(&wacom_driver);
 	if (result == 0)
-		info(DRIVER_VERSION ":" DRIVER_DESC);
+		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+		       DRIVER_DESC "\n");
 	return result;
 }

A message that is not in the archive (sent off-list or not yet received): [email protected]

Dmitry Torokhov

2008-10-10 13:42 UTC #2 lore raw

Quoted 5 lines · Greg KH

From: Greg Kroah-Hartman <[email protected]>
USB should not be having it's own printk macros, so remove info() and use the system-wide standard of dev_info() wherever possible.

Quoted 9 lines

Cc Dmitry Torokhov <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
Dmitry, this has been in the USB tree for a few months now, sorry for not sending it to you sooner. I can easily keep it in my tree and send it to Linus for this merge if you want me to, or you can take it in your tree, which ever you want me to do.

Greg, just push it through your tree since it's already there. I don't think we have any clashes in this code.

Thanks.

Signature · 5 lines

Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Greg KH

author

2008-10-10 16:01 UTC #3 lore raw

Quoted 16 lines · Dmitry Torokhov

Quoted 5 lines · Greg KH
From: Greg Kroah-Hartman <[email protected]>
USB should not be having it's own printk macros, so remove info() and use the system-wide standard of dev_info() wherever possible.
Quoted 9 lines
Cc Dmitry Torokhov <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
Dmitry, this has been in the USB tree for a few months now, sorry for not sending it to you sooner. I can easily keep it in my tree and send it to Linus for this merge if you want me to, or you can take it in your tree, which ever you want me to do.

Quoted 2 lines

Greg, just push it through your tree since it's already there. I don't think we have any clashes in this code.

Great, thanks for letting me know.

greg k-h

David Miller

2008-10-10 16:12 UTC #4 lore raw

From: Greg KH <[email protected]>
Date: Fri, 10 Oct 2008 08:52:21 -0700

Quoted 17 lines · Dmitry Torokhov

Quoted 16 lines · Greg KH
Quoted 14 lines
From: Greg Kroah-Hartman <[email protected]>
USB should not be having it's own printk macros, so remove info() and use the system-wide standard of dev_info() wherever possible.
Cc Dmitry Torokhov <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
Dmitry, this has been in the USB tree for a few months now, sorry for not sending it to you sooner. I can easily keep it in my tree and send it to Linus for this merge if you want me to, or you can take it in your tree, which ever you want me to do.

Quoted 4 lines

Quoted 2 lines
Greg, just push it through your tree since it's already there. I don't think we have any clashes in this code.
Great, thanks for letting me know.

Right, and Jeff is away until next week so even more reason for you to take care of it via the USB tree :-)

A message that is not in the archive (sent off-list or not yet received): 20081010.091139.264833623.davem-fT/PcQaiUtIeIZ0/[email protected]

Greg KH

2008-10-10 16:20 UTC #6 lore raw

Quoted 20 lines · David Miller

From: Greg KH <[email protected]>
Date: Fri, 10 Oct 2008 08:52:21 -0700
Quoted 17 lines · Dmitry Torokhov
Quoted 16 lines · Greg KH
Quoted 14 lines
From: Greg Kroah-Hartman <[email protected]>
USB should not be having it's own printk macros, so remove info() and use the system-wide standard of dev_info() wherever possible.
Cc Dmitry Torokhov <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
Dmitry, this has been in the USB tree for a few months now, sorry for not sending it to you sooner. I can easily keep it in my tree and send it to Linus for this merge if you want me to, or you can take it in your tree, which ever you want me to do.

Quoted 7 lines

Quoted 4 lines
Quoted 2 lines
Greg, just push it through your tree since it's already there. I don't think we have any clashes in this code.
Great, thanks for letting me know.
Right, and Jeff is away until next week so even more reason for you to take care of it via the USB tree :-)

Hm, which one, the patch for the drivers/net/ tree? I'll push that as well due to him being gone, thanks for reminding me.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html