aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/sun
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/sun')
-rw-r--r--drivers/net/ethernet/sun/cassini.c1
-rw-r--r--drivers/net/ethernet/sun/niu.c4
-rw-r--r--drivers/net/ethernet/sun/sungem.c1
-rw-r--r--drivers/net/ethernet/sun/sunvnet.c4
4 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
index 46d84abe553d..45292760fce4 100644
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -4946,7 +4946,6 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
4946 4946
4947 dev = alloc_etherdev(sizeof(*cp)); 4947 dev = alloc_etherdev(sizeof(*cp));
4948 if (!dev) { 4948 if (!dev) {
4949 dev_err(&pdev->dev, "Etherdev alloc failed, aborting\n");
4950 err = -ENOMEM; 4949 err = -ENOMEM;
4951 goto err_out_disable_pdev; 4950 goto err_out_disable_pdev;
4952 } 4951 }
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index cf433931304f..d83c50816714 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -9685,10 +9685,8 @@ static struct net_device * __devinit niu_alloc_and_init(
9685 struct niu *np; 9685 struct niu *np;
9686 9686
9687 dev = alloc_etherdev_mq(sizeof(struct niu), NIU_NUM_TXCHAN); 9687 dev = alloc_etherdev_mq(sizeof(struct niu), NIU_NUM_TXCHAN);
9688 if (!dev) { 9688 if (!dev)
9689 dev_err(gen_dev, "Etherdev alloc failed, aborting\n");
9690 return NULL; 9689 return NULL;
9691 }
9692 9690
9693 SET_NETDEV_DEV(dev, gen_dev); 9691 SET_NETDEV_DEV(dev, gen_dev);
9694 9692
diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c
index 31441a870b0b..ba041596e046 100644
--- a/drivers/net/ethernet/sun/sungem.c
+++ b/drivers/net/ethernet/sun/sungem.c
@@ -2885,7 +2885,6 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
2885 2885
2886 dev = alloc_etherdev(sizeof(*gp)); 2886 dev = alloc_etherdev(sizeof(*gp));
2887 if (!dev) { 2887 if (!dev) {
2888 pr_err("Etherdev alloc failed, aborting\n");
2889 err = -ENOMEM; 2888 err = -ENOMEM;
2890 goto err_disable_device; 2889 goto err_disable_device;
2891 } 2890 }
diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c
index 2896f6e9672b..92a037a8228a 100644
--- a/drivers/net/ethernet/sun/sunvnet.c
+++ b/drivers/net/ethernet/sun/sunvnet.c
@@ -1026,10 +1026,8 @@ static struct vnet * __devinit vnet_new(const u64 *local_mac)
1026 int err, i; 1026 int err, i;
1027 1027
1028 dev = alloc_etherdev(sizeof(*vp)); 1028 dev = alloc_etherdev(sizeof(*vp));
1029 if (!dev) { 1029 if (!dev)
1030 pr_err("Etherdev alloc failed, aborting\n");
1031 return ERR_PTR(-ENOMEM); 1030 return ERR_PTR(-ENOMEM);
1032 }
1033 1031
1034 for (i = 0; i < ETH_ALEN; i++) 1032 for (i = 0; i < ETH_ALEN; i++)
1035 dev->dev_addr[i] = (*local_mac >> (5 - i) * 8) & 0xff; 1033 dev->dev_addr[i] = (*local_mac >> (5 - i) * 8) & 0xff;