Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ethernet: Remove unnecessary alloc/OOM messages, alloc cleanups

alloc failures already get standardized OOM
messages and a dump_stack.

Convert kzalloc's with multiplies to kcalloc.
Convert kmalloc's with multiplies to kmalloc_array.
Fix a few whitespace defects.
Convert a constant 6 to ETH_ALEN.
Use parentheses around sizeof.
Convert vmalloc/memset to vzalloc.
Remove now unused size variables.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Joe Perches and committed by
David S. Miller
b2adaca9 09da6c5f

+97 -197
+2 -4
drivers/net/ethernet/atheros/atl1c/atl1c_main.c
··· 982 982 size = sizeof(struct atl1c_buffer) * (tpd_ring->count * 2 + 983 983 rfd_ring->count); 984 984 tpd_ring->buffer_info = kzalloc(size, GFP_KERNEL); 985 - if (unlikely(!tpd_ring->buffer_info)) { 986 - dev_err(&pdev->dev, "kzalloc failed, size = %d\n", 987 - size); 985 + if (unlikely(!tpd_ring->buffer_info)) 988 986 goto err_nomem; 989 - } 987 + 990 988 for (i = 0; i < AT_MAX_TRANSMIT_QUEUE; i++) { 991 989 tpd_ring[i].buffer_info = 992 990 (tpd_ring->buffer_info + count);
-2
drivers/net/ethernet/atheros/atl1e/atl1e_main.c
··· 819 819 size = sizeof(struct atl1e_tx_buffer) * (tx_ring->count); 820 820 tx_ring->tx_buffer = kzalloc(size, GFP_KERNEL); 821 821 if (tx_ring->tx_buffer == NULL) { 822 - netdev_err(adapter->netdev, "kzalloc failed, size = D%d\n", 823 - size); 824 822 err = -ENOMEM; 825 823 goto failed; 826 824 }
+1 -3
drivers/net/ethernet/broadcom/b44.c
··· 1518 1518 u8 pwol_mask[B44_PMASK_SIZE]; 1519 1519 1520 1520 pwol_pattern = kzalloc(B44_PATTERN_SIZE, GFP_KERNEL); 1521 - if (!pwol_pattern) { 1522 - pr_err("Memory not available for WOL\n"); 1521 + if (!pwol_pattern) 1523 1522 return; 1524 - } 1525 1523 1526 1524 /* Ipv4 magic packet pattern - pattern 0.*/ 1527 1525 memset(pwol_mask, 0, B44_PMASK_SIZE);
+2 -4
drivers/net/ethernet/broadcom/bcm63xx_enet.c
··· 886 886 priv->tx_desc_alloc_size = size; 887 887 priv->tx_desc_cpu = p; 888 888 889 - priv->tx_skb = kzalloc(sizeof(struct sk_buff *) * priv->tx_ring_size, 889 + priv->tx_skb = kcalloc(priv->tx_ring_size, sizeof(struct sk_buff *), 890 890 GFP_KERNEL); 891 891 if (!priv->tx_skb) { 892 - dev_err(kdev, "cannot allocate rx skb queue\n"); 893 892 ret = -ENOMEM; 894 893 goto out_free_tx_ring; 895 894 } ··· 899 900 spin_lock_init(&priv->tx_lock); 900 901 901 902 /* init & fill rx ring with skbs */ 902 - priv->rx_skb = kzalloc(sizeof(struct sk_buff *) * priv->rx_ring_size, 903 + priv->rx_skb = kcalloc(priv->rx_ring_size, sizeof(struct sk_buff *), 903 904 GFP_KERNEL); 904 905 if (!priv->rx_skb) { 905 - dev_err(kdev, "cannot allocate rx skb queue\n"); 906 906 ret = -ENOMEM; 907 907 goto out_free_tx_skb; 908 908 }
+2 -4
drivers/net/ethernet/broadcom/cnic.c
··· 5425 5425 5426 5426 alloc_size = sizeof(struct cnic_dev) + sizeof(struct cnic_local); 5427 5427 5428 - cdev = kzalloc(alloc_size , GFP_KERNEL); 5429 - if (cdev == NULL) { 5430 - netdev_err(dev, "allocate dev struct failure\n"); 5428 + cdev = kzalloc(alloc_size, GFP_KERNEL); 5429 + if (cdev == NULL) 5431 5430 return NULL; 5432 - } 5433 5431 5434 5432 cdev->netdev = dev; 5435 5433 cdev->cnic_priv = (char *)cdev + sizeof(struct cnic_dev);
+1 -3
drivers/net/ethernet/broadcom/tg3.c
··· 5793 5793 u32 *regs; 5794 5794 5795 5795 regs = kzalloc(TG3_REG_BLK_SIZE, GFP_ATOMIC); 5796 - if (!regs) { 5797 - netdev_err(tp->dev, "Failed allocating register dump buffer\n"); 5796 + if (!regs) 5798 5797 return; 5799 - } 5800 5798 5801 5799 if (tg3_flag(tp, PCI_EXPRESS)) { 5802 5800 /* Read up to but not including private PCI registers */
+4 -5
drivers/net/ethernet/freescale/gianfar_ethtool.c
··· 716 716 int j = MAX_FILER_IDX, l = 0x0; 717 717 int ret = 1; 718 718 719 - local_rqfpr = kmalloc(sizeof(unsigned int) * (MAX_FILER_IDX + 1), 720 - GFP_KERNEL); 721 - local_rqfcr = kmalloc(sizeof(unsigned int) * (MAX_FILER_IDX + 1), 722 - GFP_KERNEL); 719 + local_rqfpr = kmalloc_array(MAX_FILER_IDX + 1, sizeof(unsigned int), 720 + GFP_KERNEL); 721 + local_rqfcr = kmalloc_array(MAX_FILER_IDX + 1, sizeof(unsigned int), 722 + GFP_KERNEL); 723 723 if (!local_rqfpr || !local_rqfcr) { 724 - pr_err("Out of memory\n"); 725 724 ret = 0; 726 725 goto err; 727 726 }
+1 -3
drivers/net/ethernet/ibm/ehea/ehea_main.c
··· 1921 1921 u64 hret; 1922 1922 1923 1923 ehea_mcl_entry = kzalloc(sizeof(*ehea_mcl_entry), GFP_ATOMIC); 1924 - if (!ehea_mcl_entry) { 1925 - pr_err("no mem for mcl_entry\n"); 1924 + if (!ehea_mcl_entry) 1926 1925 return; 1927 - } 1928 1926 1929 1927 INIT_LIST_HEAD(&ehea_mcl_entry->list); 1930 1928
+6 -13
drivers/net/ethernet/ibm/ehea/ehea_qmr.c
··· 64 64 } 65 65 66 66 queue->queue_length = nr_of_pages * pagesize; 67 - queue->queue_pages = kmalloc(nr_of_pages * sizeof(void *), GFP_KERNEL); 68 - if (!queue->queue_pages) { 69 - pr_err("no mem for queue_pages\n"); 67 + queue->queue_pages = kmalloc_array(nr_of_pages, sizeof(void *), 68 + GFP_KERNEL); 69 + if (!queue->queue_pages) 70 70 return -ENOMEM; 71 - } 72 71 73 72 /* 74 73 * allocate pages for queue: ··· 128 129 void *vpage; 129 130 130 131 cq = kzalloc(sizeof(*cq), GFP_KERNEL); 131 - if (!cq) { 132 - pr_err("no mem for cq\n"); 132 + if (!cq) 133 133 goto out_nomem; 134 - } 135 134 136 135 cq->attr.max_nr_of_cqes = nr_of_cqe; 137 136 cq->attr.cq_token = cq_token; ··· 254 257 struct ehea_eq *eq; 255 258 256 259 eq = kzalloc(sizeof(*eq), GFP_KERNEL); 257 - if (!eq) { 258 - pr_err("no mem for eq\n"); 260 + if (!eq) 259 261 return NULL; 260 - } 261 262 262 263 eq->adapter = adapter; 263 264 eq->attr.type = type; ··· 423 428 424 429 425 430 qp = kzalloc(sizeof(*qp), GFP_KERNEL); 426 - if (!qp) { 427 - pr_err("no mem for qp\n"); 431 + if (!qp) 428 432 return NULL; 429 - } 430 433 431 434 qp->adapter = adapter; 432 435
+2 -5
drivers/net/ethernet/ibm/emac/mal.c
··· 528 528 irq_handler_t hdlr_serr, hdlr_txde, hdlr_rxde; 529 529 530 530 mal = kzalloc(sizeof(struct mal_instance), GFP_KERNEL); 531 - if (!mal) { 532 - printk(KERN_ERR 533 - "mal%d: out of memory allocating MAL structure!\n", 534 - index); 531 + if (!mal) 535 532 return -ENOMEM; 536 - } 533 + 537 534 mal->index = index; 538 535 mal->ofdev = ofdev; 539 536 mal->version = of_device_is_compatible(ofdev->dev.of_node, "ibm,mcmal2") ? 2 : 1;
-1
drivers/net/ethernet/ibm/ibmveth.c
··· 637 637 adapter->bounce_buffer = 638 638 kmalloc(netdev->mtu + IBMVETH_BUFF_OH, GFP_KERNEL); 639 639 if (!adapter->bounce_buffer) { 640 - netdev_err(netdev, "unable to allocate bounce buffer\n"); 641 640 rc = -ENOMEM; 642 641 goto err_out_free_irq; 643 642 }
+2 -3
drivers/net/ethernet/intel/igb/igb_main.c
··· 2671 2671 igb_init_queue_configuration(adapter); 2672 2672 2673 2673 /* Setup and initialize a copy of the hw vlan table array */ 2674 - adapter->shadow_vfta = kzalloc(sizeof(u32) * 2675 - E1000_VLAN_FILTER_TBL_SIZE, 2676 - GFP_ATOMIC); 2674 + adapter->shadow_vfta = kcalloc(E1000_VLAN_FILTER_TBL_SIZE, sizeof(u32), 2675 + GFP_ATOMIC); 2677 2676 2678 2677 /* This call may decrease the number of queues */ 2679 2678 if (igb_init_interrupt_scheme(adapter, true)) {
+3 -5
drivers/net/ethernet/intel/igbvf/netdev.c
··· 1399 1399 int i; 1400 1400 1401 1401 if (!netdev_mc_empty(netdev)) { 1402 - mta_list = kmalloc(netdev_mc_count(netdev) * 6, GFP_ATOMIC); 1403 - if (!mta_list) { 1404 - dev_err(&adapter->pdev->dev, 1405 - "failed to allocate multicast filter list\n"); 1402 + mta_list = kmalloc_array(netdev_mc_count(netdev), ETH_ALEN, 1403 + GFP_ATOMIC); 1404 + if (!mta_list) 1406 1405 return; 1407 - } 1408 1406 } 1409 1407 1410 1408 /* prepare a packed array of only addresses. */
+3 -5
drivers/net/ethernet/marvell/mv643xx_eth.c
··· 1879 1879 memset(rxq->rx_desc_area, 0, size); 1880 1880 1881 1881 rxq->rx_desc_area_size = size; 1882 - rxq->rx_skb = kmalloc(rxq->rx_ring_size * sizeof(*rxq->rx_skb), 1883 - GFP_KERNEL); 1884 - if (rxq->rx_skb == NULL) { 1885 - netdev_err(mp->dev, "can't allocate rx skb ring\n"); 1882 + rxq->rx_skb = kmalloc_array(rxq->rx_ring_size, sizeof(*rxq->rx_skb), 1883 + GFP_KERNEL); 1884 + if (rxq->rx_skb == NULL) 1886 1885 goto out_free; 1887 - } 1888 1886 1889 1887 rx_desc = rxq->rx_desc_area; 1890 1888 for (i = 0; i < rxq->rx_ring_size; i++) {
-1
drivers/net/ethernet/marvell/mvmdio.c
··· 164 164 165 165 bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL); 166 166 if (!bus->irq) { 167 - dev_err(&pdev->dev, "Cannot allocate PHY IRQ array\n"); 168 167 mdiobus_free(bus); 169 168 return -ENOMEM; 170 169 }
+2 -3
drivers/net/ethernet/marvell/skge.c
··· 3916 3916 /* space for skge@pci:0000:04:00.0 */ 3917 3917 hw = kzalloc(sizeof(*hw) + strlen(DRV_NAME "@pci:") 3918 3918 + strlen(pci_name(pdev)) + 1, GFP_KERNEL); 3919 - if (!hw) { 3920 - dev_err(&pdev->dev, "cannot allocate hardware struct\n"); 3919 + if (!hw) 3921 3920 goto err_out_free_regions; 3922 - } 3921 + 3923 3922 sprintf(hw->irq_name, DRV_NAME "@pci:%s", pci_name(pdev)); 3924 3923 3925 3924 hw->pdev = pdev;
+1 -3
drivers/net/ethernet/marvell/sky2.c
··· 4969 4969 4970 4970 hw = kzalloc(sizeof(*hw) + strlen(DRV_NAME "@pci:") 4971 4971 + strlen(pci_name(pdev)) + 1, GFP_KERNEL); 4972 - if (!hw) { 4973 - dev_err(&pdev->dev, "cannot allocate hardware struct\n"); 4972 + if (!hw) 4974 4973 goto err_out_free_regions; 4975 - } 4976 4974 4977 4975 hw->pdev = pdev; 4978 4976 sprintf(hw->irq_name, DRV_NAME "@pci:%s", pci_name(pdev));
+1 -3
drivers/net/ethernet/mellanox/mlx4/en_main.c
··· 191 191 192 192 printk_once(KERN_INFO "%s", mlx4_en_version); 193 193 194 - mdev = kzalloc(sizeof *mdev, GFP_KERNEL); 194 + mdev = kzalloc(sizeof(*mdev), GFP_KERNEL); 195 195 if (!mdev) { 196 - dev_err(&dev->pdev->dev, "Device struct alloc failed, " 197 - "aborting.\n"); 198 196 err = -ENOMEM; 199 197 goto err_free_res; 200 198 }
+1 -3
drivers/net/ethernet/mellanox/mlx4/main.c
··· 2054 2054 /* Allow large DMA segments, up to the firmware limit of 1 GB */ 2055 2055 dma_set_max_seg_size(&pdev->dev, 1024 * 1024 * 1024); 2056 2056 2057 - priv = kzalloc(sizeof *priv, GFP_KERNEL); 2057 + priv = kzalloc(sizeof(*priv), GFP_KERNEL); 2058 2058 if (!priv) { 2059 - dev_err(&pdev->dev, "Device struct alloc failed, " 2060 - "aborting.\n"); 2061 2059 err = -ENOMEM; 2062 2060 goto err_release_regions; 2063 2061 }
+2 -3
drivers/net/ethernet/myricom/myri10ge/myri10ge.c
··· 664 664 /* copy header of running firmware from SRAM to host memory to 665 665 * validate firmware */ 666 666 hdr = kmalloc(bytes, GFP_KERNEL); 667 - if (hdr == NULL) { 668 - dev_err(dev, "could not malloc firmware hdr\n"); 667 + if (hdr == NULL) 669 668 return -ENOMEM; 670 - } 669 + 671 670 memcpy_fromio(hdr, mgp->sram + hdr_offset, bytes); 672 671 status = myri10ge_validate_firmware(mgp, hdr); 673 672 kfree(hdr);
+1 -4
drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c
··· 201 201 adapter->mdump.md_template = 202 202 kmalloc(adapter->mdump.md_template_size, GFP_KERNEL); 203 203 204 - if (!adapter->mdump.md_template) { 205 - dev_err(&adapter->pdev->dev, "Unable to allocate memory " 206 - "for minidump template.\n"); 204 + if (!adapter->mdump.md_template) 207 205 return -ENOMEM; 208 - } 209 206 210 207 err = netxen_get_minidump_template(adapter); 211 208 if (err) {
+5 -13
drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
··· 670 670 } 671 671 672 672 cur = kzalloc(sizeof(nx_mac_list_t), GFP_ATOMIC); 673 - if (cur == NULL) { 674 - printk(KERN_ERR "%s: failed to add mac address filter\n", 675 - adapter->netdev->name); 673 + if (cur == NULL) 676 674 return -ENOMEM; 677 - } 675 + 678 676 memcpy(cur->mac_addr, addr, ETH_ALEN); 679 677 list_add_tail(&cur->list, &adapter->mac_list); 680 678 return nx_p3_sre_macaddr_change(adapter, ··· 2566 2568 adapter->mdump.md_capture_size; 2567 2569 if (!adapter->mdump.md_capture_buff) { 2568 2570 adapter->mdump.md_capture_buff = 2569 - vmalloc(adapter->mdump.md_dump_size); 2570 - if (!adapter->mdump.md_capture_buff) { 2571 - dev_info(&adapter->pdev->dev, 2572 - "Unable to allocate memory for minidump " 2573 - "capture_buffer(%d bytes).\n", 2574 - adapter->mdump.md_dump_size); 2571 + vzalloc(adapter->mdump.md_dump_size); 2572 + if (!adapter->mdump.md_capture_buff) 2575 2573 return; 2576 - } 2577 - memset(adapter->mdump.md_capture_buff, 0, 2578 - adapter->mdump.md_dump_size); 2574 + 2579 2575 if (netxen_collect_minidump(adapter)) { 2580 2576 adapter->mdump.has_valid_dump = 0; 2581 2577 adapter->mdump.md_dump_size = 0;
+10 -17
drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
··· 197 197 struct nx_host_sds_ring *sds_ring; 198 198 struct nx_host_tx_ring *tx_ring; 199 199 struct netxen_rx_buffer *rx_buf; 200 - int ring, i, size; 200 + int ring, i; 201 201 202 202 struct netxen_cmd_buffer *cmd_buf_arr; 203 203 struct net_device *netdev = adapter->netdev; 204 204 struct pci_dev *pdev = adapter->pdev; 205 205 206 - size = sizeof(struct nx_host_tx_ring); 207 - tx_ring = kzalloc(size, GFP_KERNEL); 208 - if (tx_ring == NULL) { 209 - dev_err(&pdev->dev, "%s: failed to allocate tx ring struct\n", 210 - netdev->name); 206 + tx_ring = kzalloc(sizeof(struct nx_host_tx_ring), GFP_KERNEL); 207 + if (tx_ring == NULL) 211 208 return -ENOMEM; 212 - } 209 + 213 210 adapter->tx_ring = tx_ring; 214 211 215 212 tx_ring->num_desc = adapter->num_txd; 216 213 tx_ring->txq = netdev_get_tx_queue(netdev, 0); 217 214 218 215 cmd_buf_arr = vzalloc(TX_BUFF_RINGSIZE(tx_ring)); 219 - if (cmd_buf_arr == NULL) { 220 - dev_err(&pdev->dev, "%s: failed to allocate cmd buffer ring\n", 221 - netdev->name); 216 + if (cmd_buf_arr == NULL) 222 217 goto err_out; 223 - } 218 + 224 219 tx_ring->cmd_buf_arr = cmd_buf_arr; 225 220 226 221 recv_ctx = &adapter->recv_ctx; 227 222 228 - size = adapter->max_rds_rings * sizeof (struct nx_host_rds_ring); 229 - rds_ring = kzalloc(size, GFP_KERNEL); 230 - if (rds_ring == NULL) { 231 - dev_err(&pdev->dev, "%s: failed to allocate rds ring struct\n", 232 - netdev->name); 223 + rds_ring = kcalloc(adapter->max_rds_rings, 224 + sizeof(struct nx_host_rds_ring), GFP_KERNEL); 225 + if (rds_ring == NULL) 233 226 goto err_out; 234 - } 227 + 235 228 recv_ctx->rds_rings = rds_ring; 236 229 237 230 for (ring = 0; ring < adapter->max_rds_rings; ring++) {
+1 -4
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
··· 3176 3176 } 3177 3177 3178 3178 cur = kzalloc(sizeof(struct nx_vlan_ip_list), GFP_ATOMIC); 3179 - if (cur == NULL) { 3180 - printk(KERN_ERR "%s: failed to add vlan ip to list\n", 3181 - adapter->netdev->name); 3179 + if (cur == NULL) 3182 3180 return; 3183 - } 3184 3181 3185 3182 cur->ip_addr = ifa->ifa_address; 3186 3183 list_add_tail(&cur->list, &adapter->vlan_ip_list);
+4 -6
drivers/net/ethernet/qlogic/qla3xxx.c
··· 2591 2591 else 2592 2592 qdev->lrg_buf_q_alloc_size = qdev->lrg_buf_q_size * 2; 2593 2593 2594 - qdev->lrg_buf = 2595 - kmalloc(qdev->num_large_buffers * sizeof(struct ql_rcv_buf_cb), 2596 - GFP_KERNEL); 2597 - if (qdev->lrg_buf == NULL) { 2598 - netdev_err(qdev->ndev, "qdev->lrg_buf alloc failed\n"); 2594 + qdev->lrg_buf = kmalloc_array(qdev->num_large_buffers, 2595 + sizeof(struct ql_rcv_buf_cb), 2596 + GFP_KERNEL); 2597 + if (qdev->lrg_buf == NULL) 2599 2598 return -ENOMEM; 2600 - } 2601 2599 2602 2600 qdev->lrg_buf_q_alloc_virt_addr = 2603 2601 pci_alloc_consistent(qdev->pdev,
+4 -10
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
··· 1171 1171 size = (size + 16) & ~0xF; 1172 1172 1173 1173 p_cache = kzalloc(size, GFP_KERNEL); 1174 - 1175 - if (p_cache == NULL) { 1176 - dev_err(&adapter->pdev->dev, 1177 - "Failed to allocate memory for boot loader cache\n"); 1174 + if (p_cache == NULL) 1178 1175 return -ENOMEM; 1179 - } 1176 + 1180 1177 ret = qlcnic_83xx_lockless_flash_read32(adapter, src, p_cache, 1181 1178 size / sizeof(u32)); 1182 1179 if (ret) { ··· 1484 1487 1485 1488 ahw->reset.seq_error = 0; 1486 1489 ahw->reset.buff = kzalloc(QLC_83XX_RESTART_TEMPLATE_SIZE, GFP_KERNEL); 1487 - 1488 - if (p_dev->ahw->reset.buff == NULL) { 1489 - dev_err(&p_dev->pdev->dev, 1490 - "%s: resource allocation failed\n", __func__); 1490 + if (p_dev->ahw->reset.buff == NULL) 1491 1491 return -ENOMEM; 1492 - } 1492 + 1493 1493 p_buff = p_dev->ahw->reset.buff; 1494 1494 addr = QLC_83XX_RESET_TEMPLATE_ADDR; 1495 1495 count = sizeof(struct qlc_83xx_reset_hdr) / sizeof(u32);
+2 -4
drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
··· 481 481 } 482 482 483 483 cur = kzalloc(sizeof(struct qlcnic_mac_list_s), GFP_ATOMIC); 484 - if (cur == NULL) { 485 - dev_err(&adapter->netdev->dev, 486 - "failed to add mac address filter\n"); 484 + if (cur == NULL) 487 485 return -ENOMEM; 488 - } 486 + 489 487 memcpy(cur->mac_addr, addr, ETH_ALEN); 490 488 491 489 if (qlcnic_sre_macaddr_change(adapter,
+8 -18
drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
··· 184 184 struct qlcnic_host_rds_ring *rds_ring; 185 185 struct qlcnic_host_sds_ring *sds_ring; 186 186 struct qlcnic_rx_buffer *rx_buf; 187 - int ring, i, size; 188 - 189 - struct net_device *netdev = adapter->netdev; 187 + int ring, i; 190 188 191 189 recv_ctx = adapter->recv_ctx; 192 190 193 - size = adapter->max_rds_rings * sizeof(struct qlcnic_host_rds_ring); 194 - rds_ring = kzalloc(size, GFP_KERNEL); 195 - if (rds_ring == NULL) { 196 - dev_err(&netdev->dev, "failed to allocate rds ring struct\n"); 191 + rds_ring = kcalloc(adapter->max_rds_rings, 192 + sizeof(struct qlcnic_host_rds_ring), GFP_KERNEL); 193 + if (rds_ring == NULL) 197 194 goto err_out; 198 - } 195 + 199 196 recv_ctx->rds_rings = rds_ring; 200 197 201 198 for (ring = 0; ring < adapter->max_rds_rings; ring++) { ··· 218 221 break; 219 222 } 220 223 rds_ring->rx_buf_arr = vzalloc(RCV_BUFF_RINGSIZE(rds_ring)); 221 - if (rds_ring->rx_buf_arr == NULL) { 222 - dev_err(&netdev->dev, 223 - "Failed to allocate rx buffer ring %d\n", ring); 224 + if (rds_ring->rx_buf_arr == NULL) 224 225 goto err_out; 225 - } 226 226 227 227 INIT_LIST_HEAD(&rds_ring->free_list); 228 228 /* ··· 442 448 } 443 449 444 450 buf = kcalloc(n, sizeof(struct crb_addr_pair), GFP_KERNEL); 445 - if (buf == NULL) { 446 - dev_err(&pdev->dev, "Unable to calloc memory for rom read.\n"); 451 + if (buf == NULL) 447 452 return -ENOMEM; 448 - } 449 453 450 454 for (i = 0; i < n; i++) { 451 455 if (qlcnic_rom_fast_read(adapter, 8*i + 4*offset, &val) != 0 || ··· 649 657 650 658 entry_size = flt_hdr.len - sizeof(struct qlcnic_flt_header); 651 659 flt_entry = vzalloc(entry_size); 652 - if (flt_entry == NULL) { 653 - dev_warn(&adapter->pdev->dev, "error allocating memory\n"); 660 + if (flt_entry == NULL) 654 661 return -EIO; 655 - } 656 662 657 663 ret = qlcnic_rom_fast_read_words(adapter, QLCNIC_FLT_LOCATION + 658 664 sizeof(struct qlcnic_flt_header),
+6 -13
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
··· 414 414 adapter->msix_entries = kcalloc(num_msix, 415 415 sizeof(struct msix_entry), 416 416 GFP_KERNEL); 417 - if (!adapter->msix_entries) { 418 - dev_err(&pdev->dev, "failed allocating msix_entries\n"); 417 + if (!adapter->msix_entries) 419 418 return -ENOMEM; 420 - } 421 419 } 422 420 423 421 adapter->max_sds_rings = 1; ··· 1534 1536 adapter->recv_ctx = kzalloc(sizeof(struct qlcnic_recv_context), 1535 1537 GFP_KERNEL); 1536 1538 if (!adapter->recv_ctx) { 1537 - dev_err(&adapter->pdev->dev, 1538 - "Failed to allocate recv ctx resources for adapter\n"); 1539 1539 err = -ENOMEM; 1540 1540 goto err_out; 1541 1541 } ··· 1760 1764 int qlcnic_alloc_tx_rings(struct qlcnic_adapter *adapter, 1761 1765 struct net_device *netdev) 1762 1766 { 1763 - int ring, size, vector, index; 1767 + int ring, vector, index; 1764 1768 struct qlcnic_host_tx_ring *tx_ring; 1765 1769 struct qlcnic_cmd_buffer *cmd_buf_arr; 1766 1770 1767 - size = adapter->max_drv_tx_rings * sizeof(struct qlcnic_host_tx_ring); 1768 - tx_ring = kzalloc(size, GFP_KERNEL); 1769 - if (tx_ring == NULL) { 1770 - dev_err(&netdev->dev, "failed to allocate tx rings\n"); 1771 + tx_ring = kcalloc(adapter->max_drv_tx_rings, 1772 + sizeof(struct qlcnic_host_tx_ring), GFP_KERNEL); 1773 + if (tx_ring == NULL) 1771 1774 return -ENOMEM; 1772 - } 1775 + 1773 1776 adapter->tx_ring = tx_ring; 1774 1777 1775 1778 for (ring = 0; ring < adapter->max_drv_tx_rings; ring++) { ··· 1777 1782 tx_ring->txq = netdev_get_tx_queue(netdev, ring); 1778 1783 cmd_buf_arr = vzalloc(TX_BUFF_RINGSIZE(tx_ring)); 1779 1784 if (cmd_buf_arr == NULL) { 1780 - dev_err(&netdev->dev, 1781 - "failed to allocate cmd buffer ring\n"); 1782 1785 qlcnic_free_tx_rings(adapter); 1783 1786 return -ENOMEM; 1784 1787 }
+2 -5
drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
··· 931 931 return -EIO; 932 932 933 933 fw_dump->data = vzalloc(dump_size); 934 - if (!fw_dump->data) { 935 - dev_info(&adapter->pdev->dev, 936 - "Unable to allocate (%d KB) for fw dump\n", 937 - dump_size / 1024); 934 + if (!fw_dump->data) 938 935 return -ENOMEM; 939 - } 936 + 940 937 buffer = fw_dump->data; 941 938 fw_dump->size = dump_size; 942 939 no_entries = tmpl_hdr->num_entries;
-1
drivers/net/ethernet/qlogic/qlge/qlge_main.c
··· 4572 4572 qdev->mpi_coredump = 4573 4573 vmalloc(sizeof(struct ql_mpi_coredump)); 4574 4574 if (qdev->mpi_coredump == NULL) { 4575 - dev_err(&pdev->dev, "Coredump alloc failed.\n"); 4576 4575 err = -ENOMEM; 4577 4576 goto err_out2; 4578 4577 }
+1 -2
drivers/net/ethernet/rdc/r6040.c
··· 1192 1192 lp->mii_bus->name = "r6040_eth_mii"; 1193 1193 snprintf(lp->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x", 1194 1194 dev_name(&pdev->dev), card_idx); 1195 - lp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL); 1195 + lp->mii_bus->irq = kmalloc_array(PHY_MAX_ADDR, sizeof(int), GFP_KERNEL); 1196 1196 if (!lp->mii_bus->irq) { 1197 - dev_err(&pdev->dev, "mii_bus irq allocation failed\n"); 1198 1197 err = -ENOMEM; 1199 1198 goto err_out_mdio; 1200 1199 }
+4 -6
drivers/net/ethernet/renesas/sh_eth.c
··· 891 891 mdp->rx_buf_sz += NET_IP_ALIGN; 892 892 893 893 /* Allocate RX and TX skb rings */ 894 - mdp->rx_skbuff = kmalloc(sizeof(*mdp->rx_skbuff) * mdp->num_rx_ring, 895 - GFP_KERNEL); 894 + mdp->rx_skbuff = kmalloc_array(mdp->num_rx_ring, 895 + sizeof(*mdp->rx_skbuff), GFP_KERNEL); 896 896 if (!mdp->rx_skbuff) { 897 - dev_err(&ndev->dev, "Cannot allocate Rx skb\n"); 898 897 ret = -ENOMEM; 899 898 return ret; 900 899 } 901 900 902 - mdp->tx_skbuff = kmalloc(sizeof(*mdp->tx_skbuff) * mdp->num_tx_ring, 903 - GFP_KERNEL); 901 + mdp->tx_skbuff = kmalloc_array(mdp->num_tx_ring, 902 + sizeof(*mdp->tx_skbuff), GFP_KERNEL); 904 903 if (!mdp->tx_skbuff) { 905 - dev_err(&ndev->dev, "Cannot allocate Tx skb\n"); 906 904 ret = -ENOMEM; 907 905 goto skb_ring_free; 908 906 }
+6 -5
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
··· 530 530 DBG(probe, INFO, "stmmac: txsize %d, rxsize %d, bfsize %d\n", 531 531 txsize, rxsize, bfsize); 532 532 533 - priv->rx_skbuff_dma = kmalloc(rxsize * sizeof(dma_addr_t), GFP_KERNEL); 534 - priv->rx_skbuff = 535 - kmalloc(sizeof(struct sk_buff *) * rxsize, GFP_KERNEL); 533 + priv->rx_skbuff_dma = kmalloc_array(rxsize, sizeof(dma_addr_t), 534 + GFP_KERNEL); 535 + priv->rx_skbuff = kmalloc_array(rxsize, sizeof(struct sk_buff *), 536 + GFP_KERNEL); 536 537 priv->dma_rx = 537 538 (struct dma_desc *)dma_alloc_coherent(priv->device, 538 539 rxsize * 539 540 sizeof(struct dma_desc), 540 541 &priv->dma_rx_phy, 541 542 GFP_KERNEL); 542 - priv->tx_skbuff = kmalloc(sizeof(struct sk_buff *) * txsize, 543 - GFP_KERNEL); 543 + priv->tx_skbuff = kmalloc_array(txsize, sizeof(struct sk_buff *), 544 + GFP_KERNEL); 544 545 priv->dma_tx = 545 546 (struct dma_desc *)dma_alloc_coherent(priv->device, 546 547 txsize *
+1 -1
drivers/net/ethernet/sun/niu.c
··· 4342 4342 { 4343 4343 BUILD_BUG_ON(sizeof(struct rxdma_mailbox) != 64); 4344 4344 4345 - rp->rxhash = kzalloc(MAX_RBR_RING_SIZE * sizeof(struct page *), 4345 + rp->rxhash = kcalloc(MAX_RBR_RING_SIZE, sizeof(struct page *), 4346 4346 GFP_KERNEL); 4347 4347 if (!rp->rxhash) 4348 4348 return -ENOMEM;
+3 -5
drivers/net/ethernet/ti/cpsw.c
··· 1061 1061 } 1062 1062 data->cpts_clock_shift = prop; 1063 1063 1064 - data->slave_data = kzalloc(sizeof(struct cpsw_slave_data) * 1065 - data->slaves, GFP_KERNEL); 1066 - if (!data->slave_data) { 1067 - pr_err("Could not allocate slave memory.\n"); 1064 + data->slave_data = kcalloc(data->slaves, sizeof(struct cpsw_slave_data), 1065 + GFP_KERNEL); 1066 + if (!data->slave_data) 1068 1067 return -EINVAL; 1069 - } 1070 1068 1071 1069 if (of_property_read_u32(node, "cpdma_channels", &prop)) { 1072 1070 pr_err("Missing cpdma_channels property in the DT.\n");
+1 -3
drivers/net/ethernet/ti/davinci_mdio.c
··· 320 320 int ret, addr; 321 321 322 322 data = kzalloc(sizeof(*data), GFP_KERNEL); 323 - if (!data) { 324 - dev_err(dev, "failed to alloc device data\n"); 323 + if (!data) 325 324 return -ENOMEM; 326 - } 327 325 328 326 data->bus = mdiobus_alloc(); 329 327 if (!data->bus) {
+2 -4
drivers/net/ethernet/xilinx/ll_temac_main.c
··· 238 238 int i; 239 239 240 240 lp->rx_skb = kcalloc(RX_BD_NUM, sizeof(*lp->rx_skb), GFP_KERNEL); 241 - if (!lp->rx_skb) { 242 - dev_err(&ndev->dev, 243 - "can't allocate memory for DMA RX buffer\n"); 241 + if (!lp->rx_skb) 244 242 goto out; 245 - } 243 + 246 244 /* allocate the tx and rx ring buffer descriptors. */ 247 245 /* returns a virtual address and a physical address. */ 248 246 lp->tx_bd_v = dma_alloc_coherent(ndev->dev.parent,