USB: remove info() macro from usb network drivers

[safe/jmp/linux-2.6] / drivers / net / usb / catc.c

diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index 22c17bb..466a89e 100644 (file)
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
@@ -456,7 +456,7 @@ static void catc_tx_timeout(struct net_device *netdev)
 {
        struct catc *catc = netdev_priv(netdev);
 
-       warn("Transmit timed out.");
+       dev_warn(&netdev->dev, "Transmit timed out.\n");
        usb_unlink_urb(catc->tx_urb);
 }
 
@@ -847,7 +847,8 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
                        dbg("64k Memory\n");
                        break;
                default:
-                       warn("Couldn't detect memory size, assuming 32k");
+                       dev_warn(&intf->dev,
+                                "Couldn't detect memory size, assuming 32k\n");
                case 0x87654321:
                        catc_set_reg(catc, TxBufCount, 4);
                        catc_set_reg(catc, RxBufCount, 16);
@@ -953,7 +954,8 @@ static int __init catc_init(void)
 {
        int result = usb_register(&catc_driver);
        if (result == 0)
-               info(DRIVER_VERSION " " DRIVER_DESC);
+               printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+                      DRIVER_DESC "\n");
        return result;
 }