aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/irda
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-08-18 16:21:04 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-10-17 17:41:10 -0400
commit880c9c66a60c0aa4fb4dac2da9679da5f8f41903 (patch)
treeb5053854a7c97447b554f9cd3afbb32fbb7e478c /drivers/net/irda
parent5909f6ea2bc7f785ceb1bed14c670946a536ff2d (diff)
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>
Diffstat (limited to 'drivers/net/irda')
-rw-r--r--drivers/net/irda/kingsun-sir.c3
-rw-r--r--drivers/net/irda/ks959-sir.c3
-rw-r--r--drivers/net/irda/ksdazzle-sir.c3
-rw-r--r--drivers/net/irda/stir4200.c8
4 files changed, 11 insertions, 6 deletions
diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c
index 73fe83be34fe..e1429fc6d050 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,
540 if (ret != 0) 540 if (ret != 0)
541 goto free_mem; 541 goto free_mem;
542 542
543 info("IrDA: Registered KingSun/DonShine device %s", net->name); 543 dev_info(&net->dev, "IrDA: Registered KingSun/DonShine device %s\n",
544 net->name);
544 545
545 usb_set_intfdata(intf, kingsun); 546 usb_set_intfdata(intf, kingsun);
546 547
diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c
index 8c257a51341a..2482d61662a2 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,
801 if (ret != 0) 801 if (ret != 0)
802 goto free_mem; 802 goto free_mem;
803 803
804 info("IrDA: Registered KingSun KS-959 device %s", net->name); 804 dev_info(&net->dev, "IrDA: Registered KingSun KS-959 device %s\n",
805 net->name);
805 806
806 usb_set_intfdata(intf, kingsun); 807 usb_set_intfdata(intf, kingsun);
807 808
diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/net/irda/ksdazzle-sir.c
index d01a28593ce2..1e0de93fd618 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,
705 if (ret != 0) 705 if (ret != 0)
706 goto free_mem; 706 goto free_mem;
707 707
708 info("IrDA: Registered KingSun/Dazzle device %s", net->name); 708 dev_info(&net->dev, "IrDA: Registered KingSun/Dazzle device %s\n",
709 net->name);
709 710
710 usb_set_intfdata(intf, kingsun); 711 usb_set_intfdata(intf, kingsun);
711 712
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
index 148ce2803b00..3575804fd7c6 100644
--- a/drivers/net/irda/stir4200.c
+++ b/drivers/net/irda/stir4200.c
@@ -783,8 +783,9 @@ static int stir_transmit_thread(void *arg)
783 783
784 if (unlikely(receive_start(stir))) { 784 if (unlikely(receive_start(stir))) {
785 if (net_ratelimit()) 785 if (net_ratelimit())
786 info("%s: receive usb submit failed", 786 dev_info(&dev->dev,
787 stir->netdev->name); 787 "%s: receive usb submit failed\n",
788 stir->netdev->name);
788 stir->receiving = 0; 789 stir->receiving = 0;
789 msleep(10); 790 msleep(10);
790 continue; 791 continue;
@@ -1073,7 +1074,8 @@ static int stir_probe(struct usb_interface *intf,
1073 if (ret != 0) 1074 if (ret != 0)
1074 goto err_out2; 1075 goto err_out2;
1075 1076
1076 info("IrDA: Registered SigmaTel device %s", net->name); 1077 dev_info(&intf->dev, "IrDA: Registered SigmaTel device %s\n",
1078 net->name);
1077 1079
1078 usb_set_intfdata(intf, stir); 1080 usb_set_intfdata(intf, stir);
1079 1081