aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/usb/kaweth.c
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/usb/kaweth.c
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/usb/kaweth.c')
-rw-r--r--drivers/net/usb/kaweth.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index 4f7a0106781e..fdbf3be24fda 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -1016,10 +1016,10 @@ static int kaweth_probe(
1016 */ 1016 */
1017 1017
1018 if (le16_to_cpu(dev->descriptor.bcdDevice) >> 8) { 1018 if (le16_to_cpu(dev->descriptor.bcdDevice) >> 8) {
1019 info("Firmware present in device."); 1019 dev_info(&intf->dev, "Firmware present in device.\n");
1020 } else { 1020 } else {
1021 /* Download the firmware */ 1021 /* Download the firmware */
1022 info("Downloading firmware..."); 1022 dev_info(&intf->dev, "Downloading firmware...\n");
1023 kaweth->firmware_buf = (__u8 *)__get_free_page(GFP_KERNEL); 1023 kaweth->firmware_buf = (__u8 *)__get_free_page(GFP_KERNEL);
1024 if ((result = kaweth_download_firmware(kaweth, 1024 if ((result = kaweth_download_firmware(kaweth,
1025 "kaweth/new_code.bin", 1025 "kaweth/new_code.bin",
@@ -1061,7 +1061,7 @@ static int kaweth_probe(
1061 } 1061 }
1062 1062
1063 /* Device will now disappear for a moment... */ 1063 /* Device will now disappear for a moment... */
1064 info("Firmware loaded. I'll be back..."); 1064 dev_info(&intf->dev, "Firmware loaded. I'll be back...\n");
1065err_fw: 1065err_fw:
1066 free_page((unsigned long)kaweth->firmware_buf); 1066 free_page((unsigned long)kaweth->firmware_buf);
1067 free_netdev(netdev); 1067 free_netdev(netdev);
@@ -1075,10 +1075,10 @@ err_fw:
1075 goto err_free_netdev; 1075 goto err_free_netdev;
1076 } 1076 }
1077 1077
1078 info("Statistics collection: %x", kaweth->configuration.statistics_mask); 1078 dev_info(&intf->dev, "Statistics collection: %x\n", kaweth->configuration.statistics_mask);
1079 info("Multicast filter limit: %x", kaweth->configuration.max_multicast_filters & ((1 << 15) - 1)); 1079 dev_info(&intf->dev, "Multicast filter limit: %x\n", kaweth->configuration.max_multicast_filters & ((1 << 15) - 1));
1080 info("MTU: %d", le16_to_cpu(kaweth->configuration.segment_size)); 1080 dev_info(&intf->dev, "MTU: %d\n", le16_to_cpu(kaweth->configuration.segment_size));
1081 info("Read MAC address %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x", 1081 dev_info(&intf->dev, "Read MAC address %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n",
1082 (int)kaweth->configuration.hw_addr[0], 1082 (int)kaweth->configuration.hw_addr[0],
1083 (int)kaweth->configuration.hw_addr[1], 1083 (int)kaweth->configuration.hw_addr[1],
1084 (int)kaweth->configuration.hw_addr[2], 1084 (int)kaweth->configuration.hw_addr[2],
@@ -1174,7 +1174,8 @@ err_fw:
1174 goto err_intfdata; 1174 goto err_intfdata;
1175 } 1175 }
1176 1176
1177 info("kaweth interface created at %s", kaweth->net->name); 1177 dev_info(&intf->dev, "kaweth interface created at %s\n",
1178 kaweth->net->name);
1178 1179
1179 dbg("Kaweth probe returning."); 1180 dbg("Kaweth probe returning.");
1180 1181
@@ -1205,7 +1206,7 @@ static void kaweth_disconnect(struct usb_interface *intf)
1205 struct kaweth_device *kaweth = usb_get_intfdata(intf); 1206 struct kaweth_device *kaweth = usb_get_intfdata(intf);
1206 struct net_device *netdev; 1207 struct net_device *netdev;
1207 1208
1208 info("Unregistering"); 1209 dev_info(&intf->dev, "Unregistering\n");
1209 1210
1210 usb_set_intfdata(intf, NULL); 1211 usb_set_intfdata(intf, NULL);
1211 if (!kaweth) { 1212 if (!kaweth) {