]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
e100: Remove alloc_etherdev error messages
authorJoe Jin <joe.jin@oracle.com>
Thu, 17 May 2012 03:02:23 +0000 (11:02 +0800)
committerJoe Jin <joe.jin@oracle.com>
Thu, 17 May 2012 03:02:23 +0000 (11:02 +0800)
alloc_etherdev has a generic OOM/unable to alloc message.
Remove the duplicative messages after alloc_etherdev calls.

(backported from commit 41de8d4cff21a2e81e3d9ff66f5f7c903f9c3ab1)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/e100.c

index 9a394ad1baa63d5340a1ad3c69a6582c71da43d5..d013af66f758f0f54fd7b54b1033e67b10dea39e 100644 (file)
@@ -2755,11 +2755,8 @@ static int __devinit e100_probe(struct pci_dev *pdev,
        struct nic *nic;
        int err;
 
-       if (!(netdev = alloc_etherdev(sizeof(struct nic)))) {
-               if (((1 << debug) - 1) & NETIF_MSG_PROBE)
-                       pr_err("Etherdev alloc failed, aborting\n");
+       if (!(netdev = alloc_etherdev(sizeof(struct nic))))
                return -ENOMEM;
-       }
 
        netdev->netdev_ops = &e100_netdev_ops;
        SET_ETHTOOL_OPS(netdev, &e100_ethtool_ops);