aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/usb-serial.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-08-18 16:21:04 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-10-17 17:41:09 -0400
commitc197a8db59daf06dc5e77acd5a9681329cb22458 (patch)
treede233c5994ca98d92de6b97440d39330cbfc6938 /drivers/usb/serial/usb-serial.c
parent46fcaec505d957c87b2f3820314f9e4dc0631777 (diff)
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: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/usb-serial.c')
-rw-r--r--drivers/usb/serial/usb-serial.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index e7d4246027b..92ba4f7361e 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -1160,7 +1160,7 @@ static int __init usb_serial_init(void)
1160 goto exit_generic; 1160 goto exit_generic;
1161 } 1161 }
1162 1162
1163 info(DRIVER_DESC); 1163 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
1164 1164
1165 return result; 1165 return result;
1166 1166
@@ -1237,7 +1237,7 @@ int usb_serial_register(struct usb_serial_driver *driver)
1237 retval, driver->description); 1237 retval, driver->description);
1238 list_del(&driver->driver_list); 1238 list_del(&driver->driver_list);
1239 } else 1239 } else
1240 info("USB Serial support registered for %s", 1240 printk(KERN_INFO "USB Serial support registered for %s\n",
1241 driver->description); 1241 driver->description);
1242 1242
1243 return retval; 1243 return retval;
@@ -1248,7 +1248,8 @@ EXPORT_SYMBOL_GPL(usb_serial_register);
1248void usb_serial_deregister(struct usb_serial_driver *device) 1248void usb_serial_deregister(struct usb_serial_driver *device)
1249{ 1249{
1250 /* must be called with BKL held */ 1250 /* must be called with BKL held */
1251 info("USB Serial deregistering driver %s", device->description); 1251 printk(KERN_INFO "USB Serial deregistering driver %s\n",
1252 device->description);
1252 list_del(&device->driver_list); 1253 list_del(&device->driver_list);
1253 usb_serial_bus_deregister(device); 1254 usb_serial_bus_deregister(device);
1254} 1255}