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

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

drivers/usb/misc/adutux.c

+3 −2
Original line number Diff line number Diff line
@@ -895,8 +895,9 @@ static int __init adu_init(void) 
		goto exit;

	}



	info("adutux " DRIVER_DESC " " DRIVER_VERSION);

	info("adutux is an experimental driver. Use at your own risk");

	printk(KERN_INFO "adutux " DRIVER_DESC " " DRIVER_VERSION "\n");

	printk(KERN_INFO "adutux is an experimental driver. "

	       "Use at your own risk\n");



exit:

	dbg(2," %s : leave, return value %d", __func__, result);

drivers/usb/misc/cytherm.c

+2 −1
Original line number Diff line number Diff line
@@ -428,7 +428,8 @@ static int __init usb_cytherm_init(void) 
		return result;

	}



	info(DRIVER_VERSION ":" DRIVER_DESC);

	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"

	       DRIVER_DESC "\n");

	return 0;

}

drivers/usb/misc/emi26.c

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static int emi26_writememory (struct usb_device *dev, int address, 
static int emi26_set_reset (struct usb_device *dev, unsigned char reset_bit)

{

	int response;

	info("%s - %d", __func__, reset_bit);

	dev_info(&dev->dev, "%s - %d\n", __func__, reset_bit);

	/* printk(KERN_DEBUG "%s - %d", __func__, reset_bit); */

	response = emi26_writememory (dev, CPUCS_REG, &reset_bit, 1, 0xa0);

	if (response < 0) {
@@ -254,7 +254,7 @@ static int emi26_probe(struct usb_interface *intf, const struct usb_device_id *i 
{

	struct usb_device *dev = interface_to_usbdev(intf);



	info("%s start", __func__);

	dev_info(&intf->dev, "%s start\n", __func__);



	emi26_load_firmware(dev);

drivers/usb/misc/emi62.c

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static int emi62_writememory(struct usb_device *dev, int address, 
static int emi62_set_reset (struct usb_device *dev, unsigned char reset_bit)

{

	int response;

	info("%s - %d", __func__, reset_bit);

	dev_info(&dev->dev, "%s - %d\n", __func__, reset_bit);

	

	response = emi62_writememory (dev, CPUCS_REG, &reset_bit, 1, 0xa0);

	if (response < 0) {
@@ -271,7 +271,7 @@ static int emi62_probe(struct usb_interface *intf, const struct usb_device_id *i 
	struct usb_device *dev = interface_to_usbdev(intf);

	dev_dbg(&intf->dev, "emi62_probe\n");



	info("%s start", __func__);

	dev_info(&intf->dev, "%s start\n", __func__);



	emi62_load_firmware(dev);

drivers/usb/misc/idmouse.c

+3 −2
Original line number Diff line number Diff line
@@ -403,14 +403,15 @@ static void idmouse_disconnect(struct usb_interface *interface) 
		mutex_unlock(&dev->lock);

	}



	info("%s disconnected", DRIVER_DESC);

	dev_info(&interface->dev, "disconnected\n");

}



static int __init usb_idmouse_init(void)

{

	int result;



	info(DRIVER_DESC " " DRIVER_VERSION);

	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"

	       DRIVER_DESC "\n");



	/* register this driver with the USB subsystem */

	result = usb_register(&idmouse_driver);