USB: remove info() macro from usb network 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.

Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

4 files changed, 11 insertions, 6 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);