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/ftdi_sio.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/ftdi_sio.c')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 89dab5c3682c..bcadb1f4f5dd 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -1154,7 +1154,7 @@ static void ftdi_determine_type(struct usb_serial_port *port) | |||
1154 | /* Assume its an FT232R */ | 1154 | /* Assume its an FT232R */ |
1155 | priv->chip_type = FT232RL; | 1155 | priv->chip_type = FT232RL; |
1156 | } | 1156 | } |
1157 | info("Detected %s", ftdi_chip_name[priv->chip_type]); | 1157 | dev_info(&udev->dev, "Detected %s\n", ftdi_chip_name[priv->chip_type]); |
1158 | } | 1158 | } |
1159 | 1159 | ||
1160 | 1160 | ||
@@ -1410,7 +1410,8 @@ static int ftdi_jtag_probe(struct usb_serial *serial) | |||
1410 | dbg("%s", __func__); | 1410 | dbg("%s", __func__); |
1411 | 1411 | ||
1412 | if (interface == udev->actconfig->interface[0]) { | 1412 | if (interface == udev->actconfig->interface[0]) { |
1413 | info("Ignoring serial port reserved for JTAG"); | 1413 | dev_info(&udev->dev, |
1414 | "Ignoring serial port reserved for JTAG\n"); | ||
1414 | return -ENODEV; | 1415 | return -ENODEV; |
1415 | } | 1416 | } |
1416 | 1417 | ||
@@ -1428,7 +1429,8 @@ static int ftdi_mtxorb_hack_setup(struct usb_serial *serial) | |||
1428 | 1429 | ||
1429 | if (ep->enabled && ep_desc->wMaxPacketSize == 0) { | 1430 | if (ep->enabled && ep_desc->wMaxPacketSize == 0) { |
1430 | ep_desc->wMaxPacketSize = cpu_to_le16(0x40); | 1431 | ep_desc->wMaxPacketSize = cpu_to_le16(0x40); |
1431 | info("Fixing invalid wMaxPacketSize on read pipe"); | 1432 | dev_info(&serial->dev->dev, |
1433 | "Fixing invalid wMaxPacketSize on read pipe\n"); | ||
1432 | } | 1434 | } |
1433 | 1435 | ||
1434 | return 0; | 1436 | return 0; |
@@ -2426,7 +2428,8 @@ static int __init ftdi_init(void) | |||
2426 | if (retval) | 2428 | if (retval) |
2427 | goto failed_usb_register; | 2429 | goto failed_usb_register; |
2428 | 2430 | ||
2429 | info(DRIVER_VERSION ":" DRIVER_DESC); | 2431 | printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" |
2432 | DRIVER_DESC "\n"); | ||
2430 | return 0; | 2433 | return 0; |
2431 | failed_usb_register: | 2434 | failed_usb_register: |
2432 | usb_serial_deregister(&ftdi_sio_device); | 2435 | usb_serial_deregister(&ftdi_sio_device); |