aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/amd/ni65.c4
-rw-r--r--drivers/net/ethernet/apple/bmac.c4
-rw-r--r--drivers/net/ethernet/apple/mace.c4
-rw-r--r--drivers/net/ethernet/broadcom/bnx2.c4
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c4
-rw-r--r--drivers/net/ethernet/brocade/bna/bnad_debugfs.c21
-rw-r--r--drivers/net/ethernet/cisco/enic/enic_main.c1
-rw-r--r--drivers/net/ethernet/cisco/enic/vnic_rq.c4
-rw-r--r--drivers/net/ethernet/cisco/enic/vnic_wq.c4
-rw-r--r--drivers/net/ethernet/i825xx/lp486e.c2
-rw-r--r--drivers/net/ethernet/ibm/emac/rgmii.c5
-rw-r--r--drivers/net/ethernet/ibm/emac/tah.c5
-rw-r--r--drivers/net/ethernet/ibm/emac/zmii.c5
-rw-r--r--drivers/net/ethernet/intel/e1000/e1000_main.c4
-rw-r--r--drivers/net/ethernet/intel/ixgb/ixgb_main.c4
-rw-r--r--drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c6
-rw-r--r--drivers/net/ethernet/korina.c1
-rw-r--r--drivers/net/ethernet/marvell/pxa168_eth.c10
-rw-r--r--drivers/net/ethernet/mellanox/mlx4/en_rx.c5
-rw-r--r--drivers/net/ethernet/mellanox/mlx4/en_tx.c6
-rw-r--r--drivers/net/ethernet/micrel/ks8851_mll.c4
-rw-r--r--drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c9
-rw-r--r--drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c12
-rw-r--r--drivers/net/ethernet/qlogic/qlge/qlge_dbg.c4
-rw-r--r--drivers/net/ethernet/sis/sis900.c1
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_main.c5
-rw-r--r--drivers/net/ethernet/sun/cassini.c1
-rw-r--r--drivers/net/ethernet/sun/sunvnet.c9
-rw-r--r--drivers/net/ethernet/toshiba/ps3_gelic_wireless.c5
29 files changed, 39 insertions, 114 deletions
diff --git a/drivers/net/ethernet/amd/ni65.c b/drivers/net/ethernet/amd/ni65.c
index 6e6aa7213aa..735c213798b 100644
--- a/drivers/net/ethernet/amd/ni65.c
+++ b/drivers/net/ethernet/amd/ni65.c
@@ -621,10 +621,8 @@ static void *ni65_alloc_mem(struct net_device *dev,char *what,int size,int type)
621 } 621 }
622 else { 622 else {
623 ret = ptr = kmalloc(T_BUF_SIZE,GFP_KERNEL | GFP_DMA); 623 ret = ptr = kmalloc(T_BUF_SIZE,GFP_KERNEL | GFP_DMA);
624 if(!ret) { 624 if(!ret)
625 printk(KERN_WARNING "%s: unable to allocate %s memory.\n",dev->name,what);
626 return NULL; 625 return NULL;
627 }
628 } 626 }
629 if( (u32) virt_to_phys(ptr+size) > 0x1000000) { 627 if( (u32) virt_to_phys(ptr+size) > 0x1000000) {
630 printk(KERN_WARNING "%s: unable to allocate %s memory in lower 16MB!\n",dev->name,what); 628 printk(KERN_WARNING "%s: unable to allocate %s memory in lower 16MB!\n",dev->name,what);
diff --git a/drivers/net/ethernet/apple/bmac.c b/drivers/net/ethernet/apple/bmac.c
index d070b229dbf..4108ac800cf 100644
--- a/drivers/net/ethernet/apple/bmac.c
+++ b/drivers/net/ethernet/apple/bmac.c
@@ -1660,10 +1660,8 @@ static int __init bmac_init(void)
1660{ 1660{
1661 if (bmac_emergency_rxbuf == NULL) { 1661 if (bmac_emergency_rxbuf == NULL) {
1662 bmac_emergency_rxbuf = kmalloc(RX_BUFLEN, GFP_KERNEL); 1662 bmac_emergency_rxbuf = kmalloc(RX_BUFLEN, GFP_KERNEL);
1663 if (bmac_emergency_rxbuf == NULL) { 1663 if (bmac_emergency_rxbuf == NULL)
1664 printk(KERN_ERR "BMAC: can't allocate emergency RX buffer\n");
1665 return -ENOMEM; 1664 return -ENOMEM;
1666 }
1667 } 1665 }
1668 1666
1669 return macio_register_driver(&bmac_driver); 1667 return macio_register_driver(&bmac_driver);
diff --git a/drivers/net/ethernet/apple/mace.c b/drivers/net/ethernet/apple/mace.c
index bec87bd9195..45ba18ee3d6 100644
--- a/drivers/net/ethernet/apple/mace.c
+++ b/drivers/net/ethernet/apple/mace.c
@@ -136,10 +136,8 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
136 */ 136 */
137 if (dummy_buf == NULL) { 137 if (dummy_buf == NULL) {
138 dummy_buf = kmalloc(RX_BUFLEN+2, GFP_KERNEL); 138 dummy_buf = kmalloc(RX_BUFLEN+2, GFP_KERNEL);
139 if (dummy_buf == NULL) { 139 if (dummy_buf == NULL)
140 printk(KERN_ERR "MACE: couldn't allocate dummy buffer\n");
141 return -ENOMEM; 140 return -ENOMEM;
142 }
143 } 141 }
144 142
145 if (macio_request_resources(mdev, "mace")) { 143 if (macio_request_resources(mdev, "mace")) {
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 021fb818007..0a4c5405dcf 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -2625,10 +2625,8 @@ bnx2_alloc_bad_rbuf(struct bnx2 *bp)
2625 u32 val; 2625 u32 val;
2626 2626
2627 good_mbuf = kmalloc(512 * sizeof(u16), GFP_KERNEL); 2627 good_mbuf = kmalloc(512 * sizeof(u16), GFP_KERNEL);
2628 if (good_mbuf == NULL) { 2628 if (good_mbuf == NULL)
2629 pr_err("Failed to allocate memory in %s\n", __func__);
2630 return -ENOMEM; 2629 return -ENOMEM;
2631 }
2632 2630
2633 REG_WR(bp, BNX2_MISC_ENABLE_SET_BITS, 2631 REG_WR(bp, BNX2_MISC_ENABLE_SET_BITS,
2634 BNX2_MISC_ENABLE_SET_BITS_RX_MBUF_ENABLE); 2632 BNX2_MISC_ENABLE_SET_BITS_RX_MBUF_ENABLE);
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index fea96150539..582cbcf5f9f 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -10894,10 +10894,8 @@ static inline void be16_to_cpu_n(const u8 *_source, u8 *_target, u32 n)
10894do { \ 10894do { \
10895 u32 len = be32_to_cpu(fw_hdr->arr.len); \ 10895 u32 len = be32_to_cpu(fw_hdr->arr.len); \
10896 bp->arr = kmalloc(len, GFP_KERNEL); \ 10896 bp->arr = kmalloc(len, GFP_KERNEL); \
10897 if (!bp->arr) { \ 10897 if (!bp->arr) \
10898 pr_err("Failed to allocate %d bytes for "#arr"\n", len); \
10899 goto lbl; \ 10898 goto lbl; \
10900 } \
10901 func(bp->firmware->data + be32_to_cpu(fw_hdr->arr.offset), \ 10899 func(bp->firmware->data + be32_to_cpu(fw_hdr->arr.offset), \
10902 (u8 *)bp->arr, len); \ 10900 (u8 *)bp->arr, len); \
10903} while (0) 10901} while (0)
diff --git a/drivers/net/ethernet/brocade/bna/bnad_debugfs.c b/drivers/net/ethernet/brocade/bna/bnad_debugfs.c
index 592ad3929f5..c9fdceb135f 100644
--- a/drivers/net/ethernet/brocade/bna/bnad_debugfs.c
+++ b/drivers/net/ethernet/brocade/bna/bnad_debugfs.c
@@ -62,8 +62,6 @@ bnad_debugfs_open_fwtrc(struct inode *inode, struct file *file)
62 if (!fw_debug->debug_buffer) { 62 if (!fw_debug->debug_buffer) {
63 kfree(fw_debug); 63 kfree(fw_debug);
64 fw_debug = NULL; 64 fw_debug = NULL;
65 pr_warn("bna %s: Failed to allocate fwtrc buffer\n",
66 pci_name(bnad->pcidev));
67 return -ENOMEM; 65 return -ENOMEM;
68 } 66 }
69 67
@@ -105,8 +103,6 @@ bnad_debugfs_open_fwsave(struct inode *inode, struct file *file)
105 if (!fw_debug->debug_buffer) { 103 if (!fw_debug->debug_buffer) {
106 kfree(fw_debug); 104 kfree(fw_debug);
107 fw_debug = NULL; 105 fw_debug = NULL;
108 pr_warn("bna %s: Failed to allocate fwsave buffer\n",
109 pci_name(bnad->pcidev));
110 return -ENOMEM; 106 return -ENOMEM;
111 } 107 }
112 108
@@ -208,8 +204,6 @@ bnad_debugfs_open_drvinfo(struct inode *inode, struct file *file)
208 if (!drv_info->debug_buffer) { 204 if (!drv_info->debug_buffer) {
209 kfree(drv_info); 205 kfree(drv_info);
210 drv_info = NULL; 206 drv_info = NULL;
211 pr_warn("bna %s: Failed to allocate drv info buffer\n",
212 pci_name(bnad->pcidev));
213 return -ENOMEM; 207 return -ENOMEM;
214 } 208 }
215 209
@@ -348,11 +342,8 @@ bnad_debugfs_write_regrd(struct file *file, const char __user *buf,
348 342
349 /* Allocate memory to store the user space buf */ 343 /* Allocate memory to store the user space buf */
350 kern_buf = kzalloc(nbytes, GFP_KERNEL); 344 kern_buf = kzalloc(nbytes, GFP_KERNEL);
351 if (!kern_buf) { 345 if (!kern_buf)
352 pr_warn("bna %s: Failed to allocate user buffer\n",
353 pci_name(bnad->pcidev));
354 return -ENOMEM; 346 return -ENOMEM;
355 }
356 347
357 if (copy_from_user(kern_buf, (void __user *)buf, nbytes)) { 348 if (copy_from_user(kern_buf, (void __user *)buf, nbytes)) {
358 kfree(kern_buf); 349 kfree(kern_buf);
@@ -373,11 +364,8 @@ bnad_debugfs_write_regrd(struct file *file, const char __user *buf,
373 bnad->reglen = 0; 364 bnad->reglen = 0;
374 365
375 bnad->regdata = kzalloc(len << 2, GFP_KERNEL); 366 bnad->regdata = kzalloc(len << 2, GFP_KERNEL);
376 if (!bnad->regdata) { 367 if (!bnad->regdata)
377 pr_warn("bna %s: Failed to allocate regrd buffer\n",
378 pci_name(bnad->pcidev));
379 return -ENOMEM; 368 return -ENOMEM;
380 }
381 369
382 bnad->reglen = len << 2; 370 bnad->reglen = len << 2;
383 rb = bfa_ioc_bar0(ioc); 371 rb = bfa_ioc_bar0(ioc);
@@ -421,11 +409,8 @@ bnad_debugfs_write_regwr(struct file *file, const char __user *buf,
421 409
422 /* Allocate memory to store the user space buf */ 410 /* Allocate memory to store the user space buf */
423 kern_buf = kzalloc(nbytes, GFP_KERNEL); 411 kern_buf = kzalloc(nbytes, GFP_KERNEL);
424 if (!kern_buf) { 412 if (!kern_buf)
425 pr_warn("bna %s: Failed to allocate user buffer\n",
426 pci_name(bnad->pcidev));
427 return -ENOMEM; 413 return -ENOMEM;
428 }
429 414
430 if (copy_from_user(kern_buf, (void __user *)buf, nbytes)) { 415 if (copy_from_user(kern_buf, (void __user *)buf, nbytes)) {
431 kfree(kern_buf); 416 kfree(kern_buf);
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index ab3f67f980d..07df13745c4 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -2388,7 +2388,6 @@ static int __devinit enic_probe(struct pci_dev *pdev,
2388 /* Allocate structure for port profiles */ 2388 /* Allocate structure for port profiles */
2389 enic->pp = kcalloc(num_pps, sizeof(*enic->pp), GFP_KERNEL); 2389 enic->pp = kcalloc(num_pps, sizeof(*enic->pp), GFP_KERNEL);
2390 if (!enic->pp) { 2390 if (!enic->pp) {
2391 pr_err("port profile alloc failed, aborting\n");
2392 err = -ENOMEM; 2391 err = -ENOMEM;
2393 goto err_out_disable_sriov_pp; 2392 goto err_out_disable_sriov_pp;
2394 } 2393 }
diff --git a/drivers/net/ethernet/cisco/enic/vnic_rq.c b/drivers/net/ethernet/cisco/enic/vnic_rq.c
index 34105e0951a..7e1488fc8ab 100644
--- a/drivers/net/ethernet/cisco/enic/vnic_rq.c
+++ b/drivers/net/ethernet/cisco/enic/vnic_rq.c
@@ -38,10 +38,8 @@ static int vnic_rq_alloc_bufs(struct vnic_rq *rq)
38 38
39 for (i = 0; i < blks; i++) { 39 for (i = 0; i < blks; i++) {
40 rq->bufs[i] = kzalloc(VNIC_RQ_BUF_BLK_SZ(count), GFP_ATOMIC); 40 rq->bufs[i] = kzalloc(VNIC_RQ_BUF_BLK_SZ(count), GFP_ATOMIC);
41 if (!rq->bufs[i]) { 41 if (!rq->bufs[i])
42 pr_err("Failed to alloc rq_bufs\n");
43 return -ENOMEM; 42 return -ENOMEM;
44 }
45 } 43 }
46 44
47 for (i = 0; i < blks; i++) { 45 for (i = 0; i < blks; i++) {
diff --git a/drivers/net/ethernet/cisco/enic/vnic_wq.c b/drivers/net/ethernet/cisco/enic/vnic_wq.c
index df61bd932ea..5e0d7a2be9b 100644
--- a/drivers/net/ethernet/cisco/enic/vnic_wq.c
+++ b/drivers/net/ethernet/cisco/enic/vnic_wq.c
@@ -38,10 +38,8 @@ static int vnic_wq_alloc_bufs(struct vnic_wq *wq)
38 38
39 for (i = 0; i < blks; i++) { 39 for (i = 0; i < blks; i++) {
40 wq->bufs[i] = kzalloc(VNIC_WQ_BUF_BLK_SZ(count), GFP_ATOMIC); 40 wq->bufs[i] = kzalloc(VNIC_WQ_BUF_BLK_SZ(count), GFP_ATOMIC);
41 if (!wq->bufs[i]) { 41 if (!wq->bufs[i])
42 pr_err("Failed to alloc wq_bufs\n");
43 return -ENOMEM; 42 return -ENOMEM;
44 }
45 } 43 }
46 44
47 for (i = 0; i < blks; i++) { 45 for (i = 0; i < blks; i++) {
diff --git a/drivers/net/ethernet/i825xx/lp486e.c b/drivers/net/ethernet/i825xx/lp486e.c
index 414044b3cb1..02df5f5accb 100644
--- a/drivers/net/ethernet/i825xx/lp486e.c
+++ b/drivers/net/ethernet/i825xx/lp486e.c
@@ -454,8 +454,6 @@ init_rx_bufs(struct net_device *dev, int num) {
454 } 454 }
455 455
456 rfd->rbd = rbd; 456 rfd->rbd = rbd;
457 } else {
458 printk("Could not kmalloc rbd\n");
459 } 457 }
460 } 458 }
461 lp->rbd_tail->next = rfd->rbd; 459 lp->rbd_tail->next = rfd->rbd;
diff --git a/drivers/net/ethernet/ibm/emac/rgmii.c b/drivers/net/ethernet/ibm/emac/rgmii.c
index 05484f918ee..d3123282e18 100644
--- a/drivers/net/ethernet/ibm/emac/rgmii.c
+++ b/drivers/net/ethernet/ibm/emac/rgmii.c
@@ -237,11 +237,8 @@ static int __devinit rgmii_probe(struct platform_device *ofdev)
237 237
238 rc = -ENOMEM; 238 rc = -ENOMEM;
239 dev = kzalloc(sizeof(struct rgmii_instance), GFP_KERNEL); 239 dev = kzalloc(sizeof(struct rgmii_instance), GFP_KERNEL);
240 if (dev == NULL) { 240 if (dev == NULL)
241 printk(KERN_ERR "%s: could not allocate RGMII device!\n",
242 np->full_name);
243 goto err_gone; 241 goto err_gone;
244 }
245 242
246 mutex_init(&dev->lock); 243 mutex_init(&dev->lock);
247 dev->ofdev = ofdev; 244 dev->ofdev = ofdev;
diff --git a/drivers/net/ethernet/ibm/emac/tah.c b/drivers/net/ethernet/ibm/emac/tah.c
index 0d9881efe2f..872912ef518 100644
--- a/drivers/net/ethernet/ibm/emac/tah.c
+++ b/drivers/net/ethernet/ibm/emac/tah.c
@@ -96,11 +96,8 @@ static int __devinit tah_probe(struct platform_device *ofdev)
96 96
97 rc = -ENOMEM; 97 rc = -ENOMEM;
98 dev = kzalloc(sizeof(struct tah_instance), GFP_KERNEL); 98 dev = kzalloc(sizeof(struct tah_instance), GFP_KERNEL);
99 if (dev == NULL) { 99 if (dev == NULL)
100 printk(KERN_ERR "%s: could not allocate TAH device!\n",
101 np->full_name);
102 goto err_gone; 100 goto err_gone;
103 }
104 101
105 mutex_init(&dev->lock); 102 mutex_init(&dev->lock);
106 dev->ofdev = ofdev; 103 dev->ofdev = ofdev;
diff --git a/drivers/net/ethernet/ibm/emac/zmii.c b/drivers/net/ethernet/ibm/emac/zmii.c
index e799a6116ba..415e9b4d540 100644
--- a/drivers/net/ethernet/ibm/emac/zmii.c
+++ b/drivers/net/ethernet/ibm/emac/zmii.c
@@ -240,11 +240,8 @@ static int __devinit zmii_probe(struct platform_device *ofdev)
240 240
241 rc = -ENOMEM; 241 rc = -ENOMEM;
242 dev = kzalloc(sizeof(struct zmii_instance), GFP_KERNEL); 242 dev = kzalloc(sizeof(struct zmii_instance), GFP_KERNEL);
243 if (dev == NULL) { 243 if (dev == NULL)
244 printk(KERN_ERR "%s: could not allocate ZMII device!\n",
245 np->full_name);
246 goto err_gone; 244 goto err_gone;
247 }
248 245
249 mutex_init(&dev->lock); 246 mutex_init(&dev->lock);
250 dev->ofdev = ofdev; 247 dev->ofdev = ofdev;
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 669ca3800c0..363fd395c75 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -730,10 +730,8 @@ static void e1000_dump_eeprom(struct e1000_adapter *adapter)
730 eeprom.offset = 0; 730 eeprom.offset = 0;
731 731
732 data = kmalloc(eeprom.len, GFP_KERNEL); 732 data = kmalloc(eeprom.len, GFP_KERNEL);
733 if (!data) { 733 if (!data)
734 pr_err("Unable to allocate memory to dump EEPROM data\n");
735 return; 734 return;
736 }
737 735
738 ops->get_eeprom(netdev, &eeprom, data); 736 ops->get_eeprom(netdev, &eeprom, data);
739 737
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index 9bd5faf64a8..002478801a1 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -1136,10 +1136,8 @@ ixgb_set_multi(struct net_device *netdev)
1136 u8 *mta = kmalloc(IXGB_MAX_NUM_MULTICAST_ADDRESSES * 1136 u8 *mta = kmalloc(IXGB_MAX_NUM_MULTICAST_ADDRESSES *
1137 ETH_ALEN, GFP_ATOMIC); 1137 ETH_ALEN, GFP_ATOMIC);
1138 u8 *addr; 1138 u8 *addr;
1139 if (!mta) { 1139 if (!mta)
1140 pr_err("allocation of multicast memory failed\n");
1141 goto alloc_failed; 1140 goto alloc_failed;
1142 }
1143 1141
1144 IXGB_WRITE_REG(hw, RCTL, rctl); 1142 IXGB_WRITE_REG(hw, RCTL, rctl);
1145 1143
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index bed411bada2..f3bc9333a08 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -2517,12 +2517,8 @@ int ixgbevf_setup_rx_resources(struct ixgbevf_adapter *adapter,
2517 2517
2518 size = sizeof(struct ixgbevf_rx_buffer) * rx_ring->count; 2518 size = sizeof(struct ixgbevf_rx_buffer) * rx_ring->count;
2519 rx_ring->rx_buffer_info = vzalloc(size); 2519 rx_ring->rx_buffer_info = vzalloc(size);
2520 if (!rx_ring->rx_buffer_info) { 2520 if (!rx_ring->rx_buffer_info)
2521 hw_dbg(&adapter->hw,
2522 "Unable to vmalloc buffer memory for "
2523 "the receive descriptor ring\n");
2524 goto alloc_failed; 2521 goto alloc_failed;
2525 }
2526 2522
2527 /* Round up to nearest 4K */ 2523 /* Round up to nearest 4K */
2528 rx_ring->size = rx_ring->count * sizeof(union ixgbe_adv_rx_desc); 2524 rx_ring->size = rx_ring->count * sizeof(union ixgbe_adv_rx_desc);
diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c
index 6ad094f176f..341d10130dc 100644
--- a/drivers/net/ethernet/korina.c
+++ b/drivers/net/ethernet/korina.c
@@ -1150,7 +1150,6 @@ static int korina_probe(struct platform_device *pdev)
1150 1150
1151 lp->td_ring = kmalloc(TD_RING_SIZE + RD_RING_SIZE, GFP_KERNEL); 1151 lp->td_ring = kmalloc(TD_RING_SIZE + RD_RING_SIZE, GFP_KERNEL);
1152 if (!lp->td_ring) { 1152 if (!lp->td_ring) {
1153 printk(KERN_ERR DRV_NAME ": cannot allocate descriptors\n");
1154 rc = -ENXIO; 1153 rc = -ENXIO;
1155 goto probe_err_td_ring; 1154 goto probe_err_td_ring;
1156 } 1155 }
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index 953ba5851f7..92b4b4e68e3 100644
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -1017,10 +1017,9 @@ static int rxq_init(struct net_device *dev)
1017 /* Allocate RX skb rings */ 1017 /* Allocate RX skb rings */
1018 pep->rx_skb = kmalloc(sizeof(*pep->rx_skb) * pep->rx_ring_size, 1018 pep->rx_skb = kmalloc(sizeof(*pep->rx_skb) * pep->rx_ring_size,
1019 GFP_KERNEL); 1019 GFP_KERNEL);
1020 if (!pep->rx_skb) { 1020 if (!pep->rx_skb)
1021 printk(KERN_ERR "%s: Cannot alloc RX skb ring\n", dev->name);
1022 return -ENOMEM; 1021 return -ENOMEM;
1023 } 1022
1024 /* Allocate RX ring */ 1023 /* Allocate RX ring */
1025 pep->rx_desc_count = 0; 1024 pep->rx_desc_count = 0;
1026 size = pep->rx_ring_size * sizeof(struct rx_desc); 1025 size = pep->rx_ring_size * sizeof(struct rx_desc);
@@ -1081,10 +1080,9 @@ static int txq_init(struct net_device *dev)
1081 1080
1082 pep->tx_skb = kmalloc(sizeof(*pep->tx_skb) * pep->tx_ring_size, 1081 pep->tx_skb = kmalloc(sizeof(*pep->tx_skb) * pep->tx_ring_size,
1083 GFP_KERNEL); 1082 GFP_KERNEL);
1084 if (!pep->tx_skb) { 1083 if (!pep->tx_skb)
1085 printk(KERN_ERR "%s: Cannot alloc TX skb ring\n", dev->name);
1086 return -ENOMEM; 1084 return -ENOMEM;
1087 } 1085
1088 /* Allocate TX ring */ 1086 /* Allocate TX ring */
1089 pep->tx_desc_count = 0; 1087 pep->tx_desc_count = 0;
1090 size = pep->tx_ring_size * sizeof(struct tx_desc); 1088 size = pep->tx_ring_size * sizeof(struct tx_desc);
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index 971d4b6b8df..f61d0e08f52 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -281,10 +281,9 @@ int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv,
281 tmp = size * roundup_pow_of_two(MLX4_EN_MAX_RX_FRAGS * 281 tmp = size * roundup_pow_of_two(MLX4_EN_MAX_RX_FRAGS *
282 sizeof(struct skb_frag_struct)); 282 sizeof(struct skb_frag_struct));
283 ring->rx_info = vmalloc(tmp); 283 ring->rx_info = vmalloc(tmp);
284 if (!ring->rx_info) { 284 if (!ring->rx_info)
285 en_err(priv, "Failed allocating rx_info ring\n");
286 return -ENOMEM; 285 return -ENOMEM;
287 } 286
288 en_dbg(DRV, priv, "Allocated rx_info ring at addr:%p size:%d\n", 287 en_dbg(DRV, priv, "Allocated rx_info ring at addr:%p size:%d\n",
289 ring->rx_info, tmp); 288 ring->rx_info, tmp);
290 289
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
index 9ef9038d062..ff325058658 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -71,16 +71,14 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv,
71 71
72 tmp = size * sizeof(struct mlx4_en_tx_info); 72 tmp = size * sizeof(struct mlx4_en_tx_info);
73 ring->tx_info = vmalloc(tmp); 73 ring->tx_info = vmalloc(tmp);
74 if (!ring->tx_info) { 74 if (!ring->tx_info)
75 en_err(priv, "Failed allocating tx_info ring\n");
76 return -ENOMEM; 75 return -ENOMEM;
77 } 76
78 en_dbg(DRV, priv, "Allocated tx_info ring at addr:%p size:%d\n", 77 en_dbg(DRV, priv, "Allocated tx_info ring at addr:%p size:%d\n",
79 ring->tx_info, tmp); 78 ring->tx_info, tmp);
80 79
81 ring->bounce_buf = kmalloc(MAX_DESC_SIZE, GFP_KERNEL); 80 ring->bounce_buf = kmalloc(MAX_DESC_SIZE, GFP_KERNEL);
82 if (!ring->bounce_buf) { 81 if (!ring->bounce_buf) {
83 en_err(priv, "Failed allocating bounce buffer\n");
84 err = -ENOMEM; 82 err = -ENOMEM;
85 goto err_tx; 83 goto err_tx;
86 } 84 }
diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c
index a37264e61a2..4a9d57fb9fb 100644
--- a/drivers/net/ethernet/micrel/ks8851_mll.c
+++ b/drivers/net/ethernet/micrel/ks8851_mll.c
@@ -1501,10 +1501,8 @@ static int ks_hw_init(struct ks_net *ks)
1501 ks->mcast_lst_size = 0; 1501 ks->mcast_lst_size = 0;
1502 1502
1503 ks->frame_head_info = kmalloc(MHEADER_SIZE, GFP_KERNEL); 1503 ks->frame_head_info = kmalloc(MHEADER_SIZE, GFP_KERNEL);
1504 if (!ks->frame_head_info) { 1504 if (!ks->frame_head_info)
1505 pr_err("Error: Fail to allocate frame memory\n");
1506 return false; 1505 return false;
1507 }
1508 1506
1509 ks_set_mac(ks, KS_DEFAULT_MAC_ADDRESS); 1507 ks_set_mac(ks, KS_DEFAULT_MAC_ADDRESS);
1510 return true; 1508 return true;
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 3ead111111e..0217991fede 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -1587,10 +1587,8 @@ int pch_gbe_setup_tx_resources(struct pch_gbe_adapter *adapter,
1587 1587
1588 size = (int)sizeof(struct pch_gbe_buffer) * tx_ring->count; 1588 size = (int)sizeof(struct pch_gbe_buffer) * tx_ring->count;
1589 tx_ring->buffer_info = vzalloc(size); 1589 tx_ring->buffer_info = vzalloc(size);
1590 if (!tx_ring->buffer_info) { 1590 if (!tx_ring->buffer_info)
1591 pr_err("Unable to allocate memory for the buffer information\n");
1592 return -ENOMEM; 1591 return -ENOMEM;
1593 }
1594 1592
1595 tx_ring->size = tx_ring->count * (int)sizeof(struct pch_gbe_tx_desc); 1593 tx_ring->size = tx_ring->count * (int)sizeof(struct pch_gbe_tx_desc);
1596 1594
@@ -1636,10 +1634,9 @@ int pch_gbe_setup_rx_resources(struct pch_gbe_adapter *adapter,
1636 1634
1637 size = (int)sizeof(struct pch_gbe_buffer) * rx_ring->count; 1635 size = (int)sizeof(struct pch_gbe_buffer) * rx_ring->count;
1638 rx_ring->buffer_info = vzalloc(size); 1636 rx_ring->buffer_info = vzalloc(size);
1639 if (!rx_ring->buffer_info) { 1637 if (!rx_ring->buffer_info)
1640 pr_err("Unable to allocate memory for the receive descriptor ring\n");
1641 return -ENOMEM; 1638 return -ENOMEM;
1642 } 1639
1643 rx_ring->size = rx_ring->count * (int)sizeof(struct pch_gbe_rx_desc); 1640 rx_ring->size = rx_ring->count * (int)sizeof(struct pch_gbe_rx_desc);
1644 rx_ring->desc = dma_alloc_coherent(&pdev->dev, rx_ring->size, 1641 rx_ring->desc = dma_alloc_coherent(&pdev->dev, rx_ring->size,
1645 &rx_ring->dma, GFP_KERNEL); 1642 &rx_ring->dma, GFP_KERNEL);
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
index a8259cc19a6..094d26c5181 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
@@ -280,13 +280,10 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter)
280 280
281 } 281 }
282 rds_ring->rx_buf_arr = vzalloc(RCV_BUFF_RINGSIZE(rds_ring)); 282 rds_ring->rx_buf_arr = vzalloc(RCV_BUFF_RINGSIZE(rds_ring));
283 if (rds_ring->rx_buf_arr == NULL) { 283 if (rds_ring->rx_buf_arr == NULL)
284 printk(KERN_ERR "%s: Failed to allocate "
285 "rx buffer ring %d\n",
286 netdev->name, ring);
287 /* free whatever was already allocated */ 284 /* free whatever was already allocated */
288 goto err_out; 285 goto err_out;
289 } 286
290 INIT_LIST_HEAD(&rds_ring->free_list); 287 INIT_LIST_HEAD(&rds_ring->free_list);
291 /* 288 /*
292 * Now go through all of them, set reference handles 289 * Now go through all of them, set reference handles
@@ -480,11 +477,8 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter)
480 } 477 }
481 478
482 buf = kcalloc(n, sizeof(struct crb_addr_pair), GFP_KERNEL); 479 buf = kcalloc(n, sizeof(struct crb_addr_pair), GFP_KERNEL);
483 if (buf == NULL) { 480 if (buf == NULL)
484 printk("%s: netxen_pinit_from_rom: Unable to calloc memory.\n",
485 netxen_nic_driver_name);
486 return -ENOMEM; 481 return -ENOMEM;
487 }
488 482
489 for (i = 0; i < n; i++) { 483 for (i = 0; i < n; i++) {
490 if (netxen_rom_fast_read(adapter, 8*i + 4*offset, &val) != 0 || 484 if (netxen_rom_fast_read(adapter, 8*i + 4*offset, &val) != 0 ||
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
index fca804f36d6..58185b604b7 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
@@ -1824,10 +1824,8 @@ void ql_dump_hw_cb(struct ql_adapter *qdev, int size, u32 bit, u16 q_id)
1824 pr_err("%s: Enter\n", __func__); 1824 pr_err("%s: Enter\n", __func__);
1825 1825
1826 ptr = kmalloc(size, GFP_ATOMIC); 1826 ptr = kmalloc(size, GFP_ATOMIC);
1827 if (ptr == NULL) { 1827 if (ptr == NULL)
1828 pr_err("%s: Couldn't allocate a buffer\n", __func__);
1829 return; 1828 return;
1830 }
1831 1829
1832 if (ql_write_cfg(qdev, ptr, size, bit, q_id)) { 1830 if (ql_write_cfg(qdev, ptr, size, bit, q_id)) {
1833 pr_err("%s: Failed to upload control block!\n", __func__); 1831 pr_err("%s: Failed to upload control block!\n", __func__);
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index c8efc708c79..91c44688bc3 100644
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c
@@ -619,7 +619,6 @@ static int __devinit sis900_mii_probe(struct net_device * net_dev)
619 } 619 }
620 620
621 if ((mii_phy = kmalloc(sizeof(struct mii_phy), GFP_KERNEL)) == NULL) { 621 if ((mii_phy = kmalloc(sizeof(struct mii_phy), GFP_KERNEL)) == NULL) {
622 printk(KERN_WARNING "Cannot allocate mem for struct mii_phy\n");
623 mii_phy = sis_priv->first_mii; 622 mii_phy = sis_priv->first_mii;
624 while (mii_phy) { 623 while (mii_phy) {
625 struct mii_phy *phy; 624 struct mii_phy *phy;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 96fa2da3076..ffc7581879b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -954,10 +954,9 @@ static int stmmac_open(struct net_device *dev)
954 954
955#ifdef CONFIG_STMMAC_TIMER 955#ifdef CONFIG_STMMAC_TIMER
956 priv->tm = kzalloc(sizeof(struct stmmac_timer *), GFP_KERNEL); 956 priv->tm = kzalloc(sizeof(struct stmmac_timer *), GFP_KERNEL);
957 if (unlikely(priv->tm == NULL)) { 957 if (unlikely(priv->tm == NULL))
958 pr_err("%s: ERROR: timer memory alloc failed\n", __func__);
959 return -ENOMEM; 958 return -ENOMEM;
960 } 959
961 priv->tm->freq = tmrate; 960 priv->tm->freq = tmrate;
962 961
963 /* Test if the external timer can be actually used. 962 /* Test if the external timer can be actually used.
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
index f10665f594c..46d84abe553 100644
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -835,7 +835,6 @@ static int cas_saturn_firmware_init(struct cas *cp)
835 cp->fw_data = vmalloc(cp->fw_size); 835 cp->fw_data = vmalloc(cp->fw_size);
836 if (!cp->fw_data) { 836 if (!cp->fw_data) {
837 err = -ENOMEM; 837 err = -ENOMEM;
838 pr_err("\"%s\" Failed %d\n", fw_name, err);
839 goto out; 838 goto out;
840 } 839 }
841 memcpy(cp->fw_data, &fw->data[2], cp->fw_size); 840 memcpy(cp->fw_data, &fw->data[2], cp->fw_size);
diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c
index 8c6c059f348..2896f6e9672 100644
--- a/drivers/net/ethernet/sun/sunvnet.c
+++ b/drivers/net/ethernet/sun/sunvnet.c
@@ -949,10 +949,9 @@ static int __devinit vnet_port_alloc_tx_bufs(struct vnet_port *port)
949 int map_len = (ETH_FRAME_LEN + 7) & ~7; 949 int map_len = (ETH_FRAME_LEN + 7) & ~7;
950 950
951 err = -ENOMEM; 951 err = -ENOMEM;
952 if (!buf) { 952 if (!buf)
953 pr_err("TX buffer allocation failure\n");
954 goto err_out; 953 goto err_out;
955 } 954
956 err = -EFAULT; 955 err = -EFAULT;
957 if ((unsigned long)buf & (8UL - 1)) { 956 if ((unsigned long)buf & (8UL - 1)) {
958 pr_err("TX buffer misaligned\n"); 957 pr_err("TX buffer misaligned\n");
@@ -1165,10 +1164,8 @@ static int __devinit vnet_port_probe(struct vio_dev *vdev,
1165 1164
1166 port = kzalloc(sizeof(*port), GFP_KERNEL); 1165 port = kzalloc(sizeof(*port), GFP_KERNEL);
1167 err = -ENOMEM; 1166 err = -ENOMEM;
1168 if (!port) { 1167 if (!port)
1169 pr_err("Cannot allocate vnet_port\n");
1170 goto err_out_put_mdesc; 1168 goto err_out_put_mdesc;
1171 }
1172 1169
1173 for (i = 0; i < ETH_ALEN; i++) 1170 for (i = 0; i < ETH_ALEN; i++)
1174 port->raddr[i] = (*rmac >> (5 - i) * 8) & 0xff; 1171 port->raddr[i] = (*rmac >> (5 - i) * 8) & 0xff;
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
index fd4ed7f8cfa..5c14f82c495 100644
--- a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
+++ b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
@@ -1621,10 +1621,9 @@ static void gelic_wl_scan_complete_event(struct gelic_wl_info *wl)
1621 kfree(target->hwinfo); 1621 kfree(target->hwinfo);
1622 target->hwinfo = kzalloc(be16_to_cpu(scan_info->size), 1622 target->hwinfo = kzalloc(be16_to_cpu(scan_info->size),
1623 GFP_KERNEL); 1623 GFP_KERNEL);
1624 if (!target->hwinfo) { 1624 if (!target->hwinfo)
1625 pr_info("%s: kzalloc failed\n", __func__);
1626 continue; 1625 continue;
1627 } 1626
1628 /* copy hw scan info */ 1627 /* copy hw scan info */
1629 memcpy(target->hwinfo, scan_info, scan_info->size); 1628 memcpy(target->hwinfo, scan_info, scan_info->size);
1630 target->essid_len = strnlen(scan_info->essid, 1629 target->essid_len = strnlen(scan_info->essid,