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

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

USB: remove info() macro from usb/serial 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.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 46fcaec5

drivers/usb/serial/belkin_sa.c

+3 −2
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static int belkin_sa_startup(struct usb_serial *serial) 
	/* see comments at top of file */

	priv->bad_flow_control =

		(le16_to_cpu(dev->descriptor.bcdDevice) <= 0x0206) ? 1 : 0;

	info("bcdDevice: %04x, bfc: %d",

	dev_info(&dev->dev, "bcdDevice: %04x, bfc: %d\n",

					le16_to_cpu(dev->descriptor.bcdDevice),

					priv->bad_flow_control);
@@ -577,7 +577,8 @@ static int __init belkin_sa_init(void) 
	retval = usb_register(&belkin_driver);

	if (retval)

		goto failed_usb_register;

	info(DRIVER_DESC " " DRIVER_VERSION);

	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"

	       DRIVER_DESC "\n");

	return 0;

failed_usb_register:

	usb_serial_deregister(&belkin_device);

drivers/usb/serial/cp2101.c

+2 −1
Original line number Diff line number Diff line
@@ -753,7 +753,8 @@ static int __init cp2101_init(void) 
	}



	/* Success */

	info(DRIVER_DESC " " DRIVER_VERSION);

	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"

	       DRIVER_DESC "\n");

	return 0;

}

drivers/usb/serial/cyberjack.c

+3 −2
Original line number Diff line number Diff line
@@ -499,8 +499,9 @@ static int __init cyberjack_init(void) 
	if (retval)

		goto failed_usb_register;



	info(DRIVER_VERSION " " DRIVER_AUTHOR);

	info(DRIVER_DESC);

	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION " "

	       DRIVER_AUTHOR "\n");

	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");



	return 0;

failed_usb_register:

drivers/usb/serial/cypress_m8.c

+2 −1
Original line number Diff line number Diff line
@@ -1658,7 +1658,8 @@ static int __init cypress_init(void) 
	if (retval)

		goto failed_usb_register;



	info(DRIVER_DESC " " DRIVER_VERSION);

	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"

	       DRIVER_DESC "\n");

	return 0;



failed_usb_register:

drivers/usb/serial/digi_acceleport.c

+2 −1
Original line number Diff line number Diff line
@@ -1854,7 +1854,8 @@ static int __init digi_init(void) 
	retval = usb_register(&digi_driver);

	if (retval)

		goto failed_usb_register;

	info(DRIVER_VERSION ":" DRIVER_DESC);

	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"

	       DRIVER_DESC "\n");

	return 0;

failed_usb_register:

	usb_serial_deregister(&digi_acceleport_4_device);