7 files changed, 32 insertions, 22 deletions

diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c
index 73fe83be34f..e1429fc6d05 100644
--- a/drivers/net/irda/kingsun-sir.c
+++ b/drivers/net/irda/kingsun-sir.c
@@ -540,7 +540,8 @@ static int kingsun_probe(struct usb_interface *intf,
         if (ret != 0)
                 goto free_mem;
 
-        info("IrDA: Registered KingSun/DonShine device %s", net->name);
+        dev_info(&net->dev, "IrDA: Registered KingSun/DonShine device %s\n",
+                 net->name);
 
         usb_set_intfdata(intf, kingsun);
 
diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c
index 8c257a51341..2482d61662a 100644
--- a/drivers/net/irda/ks959-sir.c
+++ b/drivers/net/irda/ks959-sir.c
@@ -801,7 +801,8 @@ static int ks959_probe(struct usb_interface *intf,
         if (ret != 0)
                 goto free_mem;
 
-        info("IrDA: Registered KingSun KS-959 device %s", net->name);
+        dev_info(&net->dev, "IrDA: Registered KingSun KS-959 device %s\n",
+                 net->name);
 
         usb_set_intfdata(intf, kingsun);
 
diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/net/irda/ksdazzle-sir.c
index d01a28593ce..1e0de93fd61 100644
--- a/drivers/net/irda/ksdazzle-sir.c
+++ b/drivers/net/irda/ksdazzle-sir.c
@@ -705,7 +705,8 @@ static int ksdazzle_probe(struct usb_interface *intf,
         if (ret != 0)
                 goto free_mem;
 
-        info("IrDA: Registered KingSun/Dazzle device %s", net->name);
+        dev_info(&net->dev, "IrDA: Registered KingSun/Dazzle device %s\n",
+                 net->name);
 
         usb_set_intfdata(intf, kingsun);
 
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
index 148ce2803b0..3575804fd7c 100644
--- a/drivers/net/irda/stir4200.c
+++ b/drivers/net/irda/stir4200.c
@@ -783,8 +783,9 @@ static int stir_transmit_thread(void *arg)
 
                         if (unlikely(receive_start(stir))) {
                                 if (net_ratelimit())
-                                        info("%s: receive usb submit failed",
-                                             stir->netdev->name);
+                                        dev_info(&dev->dev,
+                                                 "%s: receive usb submit failed\n",
+                                                 stir->netdev->name);
                                 stir->receiving = 0;
                                 msleep(10);
                                 continue;
@@ -1073,7 +1074,8 @@ static int stir_probe(struct usb_interface *intf,
         if (ret != 0)
                 goto err_out2;
 
-        info("IrDA: Registered SigmaTel device %s", net->name);
+        dev_info(&intf->dev, "IrDA: Registered SigmaTel device %s\n",
+                 net->name);
 
         usb_set_intfdata(intf, stir);
 
diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index 92ff9c83d9f..466a89e2444 100644
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
@@ -954,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;
 }
 
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index 4f7a0106781..fdbf3be24fd 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -1016,10 +1016,10 @@ static int kaweth_probe(
          */
 
         if (le16_to_cpu(dev->descriptor.bcdDevice) >> 8) {
-                info("Firmware present in device.");
+                dev_info(&intf->dev, "Firmware present in device.\n");
         } else {
                 /* Download the firmware */
-                info("Downloading firmware...");
+                dev_info(&intf->dev, "Downloading firmware...\n");
                 kaweth->firmware_buf = (__u8 *)__get_free_page(GFP_KERNEL);
                 if ((result = kaweth_download_firmware(kaweth,
                                                       "kaweth/new_code.bin",
@@ -1061,7 +1061,7 @@ static int kaweth_probe(
                 }
 
                 /* Device will now disappear for a moment...  */
-                info("Firmware loaded.  I'll be back...");
+                dev_info(&intf->dev, "Firmware loaded.  I'll be back...\n");
 err_fw:
                 free_page((unsigned long)kaweth->firmware_buf);
                 free_netdev(netdev);
@@ -1075,10 +1075,10 @@ err_fw:
                 goto err_free_netdev;
         }
 
-        info("Statistics collection: %x", kaweth->configuration.statistics_mask);
-        info("Multicast filter limit: %x", kaweth->configuration.max_multicast_filters & ((1 << 15) - 1));
-        info("MTU: %d", le16_to_cpu(kaweth->configuration.segment_size));
-        info("Read MAC address %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x",
+        dev_info(&intf->dev, "Statistics collection: %x\n", kaweth->configuration.statistics_mask);
+        dev_info(&intf->dev, "Multicast filter limit: %x\n", kaweth->configuration.max_multicast_filters & ((1 << 15) - 1));
+        dev_info(&intf->dev, "MTU: %d\n", le16_to_cpu(kaweth->configuration.segment_size));
+        dev_info(&intf->dev, "Read MAC address %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n",
                  (int)kaweth->configuration.hw_addr[0],
                  (int)kaweth->configuration.hw_addr[1],
                  (int)kaweth->configuration.hw_addr[2],
@@ -1174,7 +1174,8 @@ err_fw:
                 goto err_intfdata;
         }
 
-        info("kaweth interface created at %s", kaweth->net->name);
+        dev_info(&intf->dev, "kaweth interface created at %s\n",
+                 kaweth->net->name);
 
         dbg("Kaweth probe returning.");
 
@@ -1205,7 +1206,7 @@ static void kaweth_disconnect(struct usb_interface *intf)
         struct kaweth_device *kaweth = usb_get_intfdata(intf);
         struct net_device *netdev;
 
-        info("Unregistering");
+        dev_info(&intf->dev, "Unregistering\n");
 
         usb_set_intfdata(intf, NULL);
         if (!kaweth) {
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index 7726b5e8676..6133401ebc6 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -538,7 +538,8 @@ static void write_bulk_callback(struct urb *urb)
         if (!netif_device_present(dev->netdev))
                 return;
         if (urb->status)
-                info("%s: Tx status %d", dev->netdev->name, urb->status);
+                dev_info(&urb->dev->dev, "%s: Tx status %d\n",
+                         dev->netdev->name, urb->status);
         dev->netdev->trans_start = jiffies;
         netif_wake_queue(dev->netdev);
 }
@@ -561,7 +562,8 @@ static void intr_callback(struct urb *urb)
                 return;
         /* -EPIPE:  should clear the halt */
         default:
-                info("%s: intr status %d", dev->netdev->name, urb->status);
+                dev_info(&urb->dev->dev, "%s: intr status %d\n",
+                         dev->netdev->name, urb->status);
                 goto resubmit;
         }
 
@@ -710,12 +712,12 @@ static void rtl8150_set_multicast(struct net_device *netdev)
         netif_stop_queue(netdev);
         if (netdev->flags & IFF_PROMISC) {
                 dev->rx_creg |= cpu_to_le16(0x0001);
-                info("%s: promiscuous mode", netdev->name);
+                dev_info(&netdev->dev, "%s: promiscuous mode\n", netdev->name);
         } else if (netdev->mc_count ||
                    (netdev->flags & IFF_ALLMULTI)) {
                 dev->rx_creg &= cpu_to_le16(0xfffe);
                 dev->rx_creg |= cpu_to_le16(0x0002);
-                info("%s: allmulti set", netdev->name);
+                dev_info(&netdev->dev, "%s: allmulti set\n", netdev->name);
         } else {
                 /* ~RX_MULTICAST, ~RX_PROMISCUOUS */
                 dev->rx_creg &= cpu_to_le16(0x00fc);
@@ -947,7 +949,7 @@ static int rtl8150_probe(struct usb_interface *intf,
                 goto out2;
         }
 
-        info("%s: rtl8150 is detected", netdev->name);
+        dev_info(&intf->dev, "%s: rtl8150 is detected\n", netdev->name);
 
         return 0;
 
@@ -984,7 +986,8 @@ static void rtl8150_disconnect(struct usb_interface *intf)
 
 static int __init usb_rtl8150_init(void)
 {
-        info(DRIVER_DESC " " DRIVER_VERSION);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
         return usb_register(&rtl8150_driver);
 }