diff options
author | Joe Perches <joe@perches.com> | 2012-01-29 08:47:52 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-01-31 16:20:48 -0500 |
commit | 41de8d4cff21a2e81e3d9ff66f5f7c903f9c3ab1 (patch) | |
tree | c441a6911ff802233473f31fa29a985e690a816a /drivers/net/usb | |
parent | e404decb0fb017be80552adee894b35307b6c7b4 (diff) |
drivers/net: Remove alloc_etherdev error messages
alloc_etherdev has a generic OOM/unable to alloc message.
Remove the duplicative messages after alloc_etherdev calls.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/pegasus.c | 4 | ||||
-rw-r--r-- | drivers/net/usb/rtl8150.c | 4 | ||||
-rw-r--r-- | drivers/net/usb/usbnet.c | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index 5d99b8cacd7d..752393092325 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c | |||
@@ -1332,10 +1332,8 @@ static int pegasus_probe(struct usb_interface *intf, | |||
1332 | usb_get_dev(dev); | 1332 | usb_get_dev(dev); |
1333 | 1333 | ||
1334 | net = alloc_etherdev(sizeof(struct pegasus)); | 1334 | net = alloc_etherdev(sizeof(struct pegasus)); |
1335 | if (!net) { | 1335 | if (!net) |
1336 | dev_err(&intf->dev, "can't allocate %s\n", "device"); | ||
1337 | goto out; | 1336 | goto out; |
1338 | } | ||
1339 | 1337 | ||
1340 | pegasus = netdev_priv(net); | 1338 | pegasus = netdev_priv(net); |
1341 | pegasus->dev_index = dev_index; | 1339 | pegasus->dev_index = dev_index; |
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c index 0710b4ca9252..6dda2fe5b15b 100644 --- a/drivers/net/usb/rtl8150.c +++ b/drivers/net/usb/rtl8150.c | |||
@@ -894,10 +894,8 @@ static int rtl8150_probe(struct usb_interface *intf, | |||
894 | struct net_device *netdev; | 894 | struct net_device *netdev; |
895 | 895 | ||
896 | netdev = alloc_etherdev(sizeof(rtl8150_t)); | 896 | netdev = alloc_etherdev(sizeof(rtl8150_t)); |
897 | if (!netdev) { | 897 | if (!netdev) |
898 | err("Out of memory"); | ||
899 | return -ENOMEM; | 898 | return -ENOMEM; |
900 | } | ||
901 | 899 | ||
902 | dev = netdev_priv(netdev); | 900 | dev = netdev_priv(netdev); |
903 | 901 | ||
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index fae0fbd8bc88..b924f46c963c 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c | |||
@@ -1334,10 +1334,8 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) | |||
1334 | 1334 | ||
1335 | // set up our own records | 1335 | // set up our own records |
1336 | net = alloc_etherdev(sizeof(*dev)); | 1336 | net = alloc_etherdev(sizeof(*dev)); |
1337 | if (!net) { | 1337 | if (!net) |
1338 | dbg ("can't kmalloc dev"); | ||
1339 | goto out; | 1338 | goto out; |
1340 | } | ||
1341 | 1339 | ||
1342 | /* netdev_printk() needs this so do it as early as possible */ | 1340 | /* netdev_printk() needs this so do it as early as possible */ |
1343 | SET_NETDEV_DEV(net, &udev->dev); | 1341 | SET_NETDEV_DEV(net, &udev->dev); |