Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 899ef6e7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: remove info() macro from usb input drivers 



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

Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 880c9c66

drivers/input/joystick/xpad.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -1844,7 +1844,8 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id) 
		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",

			dev_info(&intf->dev,

				 "Aiptek using %d ms programming speed\n",

				 aiptek->curSetting.programmableDelay);

			break;

		}
@@ -1853,7 +1854,8 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id) 
	/* 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;

	}
@@ -1925,8 +1927,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;

}