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

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

USB: remove info() macro from remaining usb 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.  In the
few places that will not work out, use a basic printk().

Clean up the remaining usages of this in the drivers/usb/ directory.

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

drivers/usb/class/cdc-acm.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1454,7 +1454,8 @@ static int __init acm_init(void) 
		return retval;

		return retval;

	}

	}





	info(DRIVER_VERSION ":" DRIVER_DESC);

	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"

	       DRIVER_DESC "\n");





	return 0;

	return 0;

}

}

drivers/usb/host/r8a66597-hcd.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -760,9 +760,11 @@ static void enable_r8a66597_pipe_dma(struct r8a66597 *r8a66597, 
			if ((r8a66597->dma_map & (1 << i)) != 0)

			if ((r8a66597->dma_map & (1 << i)) != 0)

				continue;

				continue;





			info("address %d, EndpointAddress 0x%02x use DMA FIFO",

			dev_info(&dev->udev->dev,

			     usb_pipedevice(urb->pipe),

				 "address %d, EndpointAddress 0x%02x use "

			     info->dir_in ? USB_ENDPOINT_DIR_MASK + info->epnum

				 "DMA FIFO\n", usb_pipedevice(urb->pipe),

				 info->dir_in ?

				 	USB_ENDPOINT_DIR_MASK + info->epnum

					: info->epnum);

					: info->epnum);





			r8a66597->dma_map |= 1 << i;

			r8a66597->dma_map |= 1 << i;
@@ -2387,7 +2389,8 @@ static int __init r8a66597_init(void) 
	if (usb_disabled())

	if (usb_disabled())

		return -ENODEV;

		return -ENODEV;





	info("driver %s, %s", hcd_name, DRIVER_VERSION);

	printk(KERN_INFO KBUILD_MODNAME ": driver %s, %s\n", hcd_name,

	       DRIVER_VERSION);

	return platform_driver_register(&r8a66597_driver);

	return platform_driver_register(&r8a66597_driver);

}

}

module_init(r8a66597_init);

module_init(r8a66597_init);

drivers/usb/image/mdc800.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -489,7 +489,7 @@ static int mdc800_usb_probe (struct usb_interface *intf, 
	}

	}









	info ("Found Mustek MDC800 on USB.");

	dev_info(&intf->dev, "Found Mustek MDC800 on USB.\n");





	mutex_lock(&mdc800->io_lock);

	mutex_lock(&mdc800->io_lock);
@@ -571,7 +571,7 @@ static void mdc800_usb_disconnect (struct usb_interface *intf) 
		mdc800->dev = NULL;

		mdc800->dev = NULL;

		usb_set_intfdata(intf, NULL);

		usb_set_intfdata(intf, NULL);

	}

	}

	info ("Mustek MDC800 disconnected from USB.");

	dev_info(&intf->dev, "Mustek MDC800 disconnected from USB.\n");

}

}
@@ -1020,7 +1020,8 @@ static int __init usb_mdc800_init (void) 
	if (retval)

	if (retval)

		goto cleanup_on_fail;

		goto cleanup_on_fail;





	info (DRIVER_VERSION ":" DRIVER_DESC);

	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"

	       DRIVER_DESC "\n");





	return 0;

	return 0;