diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-18 12:07:24 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-18 12:07:24 -0400 |
commit | 93ba0f037bfc7d6c6431c0db767f2244ac583578 (patch) | |
tree | 7965d02623582dd737ca0a86645aeabeb8e00ed8 /drivers/usb/serial | |
parent | 788a661a9fa59740984f509832cae33dde4b0329 (diff) |
USB: serial: safe-serial: fix up printk() usage
The driver was calling printk() directly at startup, which is just
noise. Switch over to using pr_info() where needed, and get rid of the
totally useless version number that had never ever been incremented.
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r-- | drivers/usb/serial/safe_serial.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c index e3457e2d2c0d..c949ce6ef0c6 100644 --- a/drivers/usb/serial/safe_serial.c +++ b/drivers/usb/serial/safe_serial.c | |||
@@ -62,6 +62,7 @@ | |||
62 | * | 62 | * |
63 | */ | 63 | */ |
64 | 64 | ||
65 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
65 | 66 | ||
66 | #include <linux/kernel.h> | 67 | #include <linux/kernel.h> |
67 | #include <linux/errno.h> | 68 | #include <linux/errno.h> |
@@ -84,7 +85,6 @@ | |||
84 | static bool safe = 1; | 85 | static bool safe = 1; |
85 | static bool padded = CONFIG_USB_SERIAL_SAFE_PADDED; | 86 | static bool padded = CONFIG_USB_SERIAL_SAFE_PADDED; |
86 | 87 | ||
87 | #define DRIVER_VERSION "v0.1" | ||
88 | #define DRIVER_AUTHOR "sl@lineo.com, tbr@lineo.com, Johan Hovold <jhovold@gmail.com>" | 88 | #define DRIVER_AUTHOR "sl@lineo.com, tbr@lineo.com, Johan Hovold <jhovold@gmail.com>" |
89 | #define DRIVER_DESC "USB Safe Encapsulated Serial" | 89 | #define DRIVER_DESC "USB Safe Encapsulated Serial" |
90 | 90 | ||
@@ -311,13 +311,9 @@ static int __init safe_init(void) | |||
311 | { | 311 | { |
312 | int i; | 312 | int i; |
313 | 313 | ||
314 | printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" | ||
315 | DRIVER_DESC "\n"); | ||
316 | |||
317 | /* if we have vendor / product parameters patch them into id list */ | 314 | /* if we have vendor / product parameters patch them into id list */ |
318 | if (vendor || product) { | 315 | if (vendor || product) { |
319 | printk(KERN_INFO KBUILD_MODNAME ": vendor: %x product: %x\n", | 316 | pr_info("vendor: %x product: %x\n", vendor, product); |
320 | vendor, product); | ||
321 | 317 | ||
322 | for (i = 0; i < ARRAY_SIZE(id_table); i++) { | 318 | for (i = 0; i < ARRAY_SIZE(id_table); i++) { |
323 | if (!id_table[i].idVendor && !id_table[i].idProduct) { | 319 | if (!id_table[i].idVendor && !id_table[i].idProduct) { |