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/ethernet/apple | |
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/ethernet/apple')
-rw-r--r-- | drivers/net/ethernet/apple/bmac.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/apple/mace.c | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/apple/bmac.c b/drivers/net/ethernet/apple/bmac.c index 4108ac800cf0..ebc0dba5ba33 100644 --- a/drivers/net/ethernet/apple/bmac.c +++ b/drivers/net/ethernet/apple/bmac.c | |||
@@ -1269,10 +1269,8 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i | |||
1269 | memcpy(addr, prop_addr, sizeof(addr)); | 1269 | memcpy(addr, prop_addr, sizeof(addr)); |
1270 | 1270 | ||
1271 | dev = alloc_etherdev(PRIV_BYTES); | 1271 | dev = alloc_etherdev(PRIV_BYTES); |
1272 | if (!dev) { | 1272 | if (!dev) |
1273 | printk(KERN_ERR "BMAC: alloc_etherdev failed, out of memory\n"); | ||
1274 | return -ENOMEM; | 1273 | return -ENOMEM; |
1275 | } | ||
1276 | 1274 | ||
1277 | bp = netdev_priv(dev); | 1275 | bp = netdev_priv(dev); |
1278 | SET_NETDEV_DEV(dev, &mdev->ofdev.dev); | 1276 | SET_NETDEV_DEV(dev, &mdev->ofdev.dev); |
diff --git a/drivers/net/ethernet/apple/mace.c b/drivers/net/ethernet/apple/mace.c index 45ba18ee3d6a..bd5555dbe027 100644 --- a/drivers/net/ethernet/apple/mace.c +++ b/drivers/net/ethernet/apple/mace.c | |||
@@ -147,7 +147,6 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i | |||
147 | 147 | ||
148 | dev = alloc_etherdev(PRIV_BYTES); | 148 | dev = alloc_etherdev(PRIV_BYTES); |
149 | if (!dev) { | 149 | if (!dev) { |
150 | printk(KERN_ERR "MACE: can't allocate ethernet device !\n"); | ||
151 | rc = -ENOMEM; | 150 | rc = -ENOMEM; |
152 | goto err_release; | 151 | goto err_release; |
153 | } | 152 | } |