diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-18 16:21:04 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-17 17:41:09 -0400 |
commit | c197a8db59daf06dc5e77acd5a9681329cb22458 (patch) | |
tree | de233c5994ca98d92de6b97440d39330cbfc6938 /drivers/usb/serial/safe_serial.c | |
parent | 46fcaec505d957c87b2f3820314f9e4dc0631777 (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/safe_serial.c')
-rw-r--r-- | drivers/usb/serial/safe_serial.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c index 72903ac9f5c0..40cff61cb4a2 100644 --- a/drivers/usb/serial/safe_serial.c +++ b/drivers/usb/serial/safe_serial.c | |||
@@ -250,8 +250,8 @@ static void safe_read_bulk_callback(struct urb *urb) | |||
250 | if (!fcs) { | 250 | if (!fcs) { |
251 | int actual_length = data[length - 2] >> 2; | 251 | int actual_length = data[length - 2] >> 2; |
252 | if (actual_length <= (length - 2)) { | 252 | if (actual_length <= (length - 2)) { |
253 | info("%s - actual: %d", __func__, | 253 | dev_info(&urb->dev->dev, "%s - actual: %d\n", |
254 | actual_length); | 254 | __func__, actual_length); |
255 | tty_insert_flip_string(tty, | 255 | tty_insert_flip_string(tty, |
256 | data, actual_length); | 256 | data, actual_length); |
257 | tty_flip_buffer_push(tty); | 257 | tty_flip_buffer_push(tty); |
@@ -428,14 +428,13 @@ static int __init safe_init(void) | |||
428 | { | 428 | { |
429 | int i, retval; | 429 | int i, retval; |
430 | 430 | ||
431 | info(DRIVER_VERSION " " DRIVER_AUTHOR); | 431 | printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" |
432 | info(DRIVER_DESC); | 432 | DRIVER_DESC "\n"); |
433 | info("vendor: %x product: %x safe: %d padded: %d\n", | ||
434 | vendor, product, safe, padded); | ||
435 | 433 | ||
436 | /* if we have vendor / product parameters patch them into id list */ | 434 | /* if we have vendor / product parameters patch them into id list */ |
437 | if (vendor || product) { | 435 | if (vendor || product) { |
438 | info("vendor: %x product: %x\n", vendor, product); | 436 | printk(KERN_INFO KBUILD_MODNAME ": vendor: %x product: %x\n", |
437 | vendor, product); | ||
439 | 438 | ||
440 | for (i = 0; i < ARRAY_SIZE(id_table); i++) { | 439 | for (i = 0; i < ARRAY_SIZE(id_table); i++) { |
441 | if (!id_table[i].idVendor && !id_table[i].idProduct) { | 440 | if (!id_table[i].idVendor && !id_table[i].idProduct) { |