aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/usb/catc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/usb/catc.c')
-rw-r--r--drivers/net/usb/catc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index 22c17bbacb69..466a89e24444 100644
--- 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)
456{ 456{
457 struct catc *catc = netdev_priv(netdev); 457 struct catc *catc = netdev_priv(netdev);
458 458
459 warn("Transmit timed out."); 459 dev_warn(&netdev->dev, "Transmit timed out.\n");
460 usb_unlink_urb(catc->tx_urb); 460 usb_unlink_urb(catc->tx_urb);
461} 461}
462 462
@@ -847,7 +847,8 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
847 dbg("64k Memory\n"); 847 dbg("64k Memory\n");
848 break; 848 break;
849 default: 849 default:
850 warn("Couldn't detect memory size, assuming 32k"); 850 dev_warn(&intf->dev,
851 "Couldn't detect memory size, assuming 32k\n");
851 case 0x87654321: 852 case 0x87654321:
852 catc_set_reg(catc, TxBufCount, 4); 853 catc_set_reg(catc, TxBufCount, 4);
853 catc_set_reg(catc, RxBufCount, 16); 854 catc_set_reg(catc, RxBufCount, 16);
@@ -953,7 +954,8 @@ static int __init catc_init(void)
953{ 954{
954 int result = usb_register(&catc_driver); 955 int result = usb_register(&catc_driver);
955 if (result == 0) 956 if (result == 0)
956 info(DRIVER_VERSION " " DRIVER_DESC); 957 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
958 DRIVER_DESC "\n");
957 return result; 959 return result;
958} 960}
959 961