lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

e1000: Use kcalloc()

Browse Source 
Replace kmalloc+memsetout the driver. Slightly modified by Auke Kok.

Signed-off-by: Yan Burman <burman.yan@gmail.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Yan Burman
2007-03-06 08:58:04 -08:00
committed by Jeff Garzik
parent c38db30b22
commit 1c7e5b125a
2 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/net/e1000/e1000_ethtool.c
View File

@@ -654,14 +654,11 @@ e1000_set_ringparam(struct net_device *netdev,
e1000_mac_type mac_type = adapter->hw.mac_type; e1000_mac_type mac_type = adapter->hw.mac_type;
struct e1000_tx_ring *txdr, *tx_old; struct e1000_tx_ring *txdr, *tx_old;
struct e1000_rx_ring *rxdr, *rx_old; struct e1000_rx_ring *rxdr, *rx_old;
int i, err, tx_ring_size, rx_ring_size; int i, err;
if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending)) if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
return -EINVAL; return -EINVAL;
tx_ring_size = sizeof(struct e1000_tx_ring) * adapter->num_tx_queues;
rx_ring_size = sizeof(struct e1000_rx_ring) * adapter->num_rx_queues;
while (test_and_set_bit(__E1000_RESETTING, &adapter->flags)) while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
msleep(1); msleep(1);
@@ -672,11 +669,11 @@ e1000_set_ringparam(struct net_device *netdev,
rx_old = adapter->rx_ring; rx_old = adapter->rx_ring;
err = -ENOMEM; err = -ENOMEM;
txdr = kzalloc(tx_ring_size, GFP_KERNEL); txdr = kcalloc(adapter->num_tx_queues, sizeof(struct e1000_tx_ring), GFP_KERNEL);
if (!txdr) if (!txdr)
goto err_alloc_tx; goto err_alloc_tx;
rxdr = kzalloc(rx_ring_size, GFP_KERNEL); rxdr = kcalloc(adapter->num_rx_queues, sizeof(struct e1000_rx_ring), GFP_KERNEL);
if (!rxdr) if (!rxdr)
goto err_alloc_rx; goto err_alloc_rx;
@@ -1053,23 +1050,24 @@ e1000_setup_desc_rings(struct e1000_adapter *adapter)
struct e1000_rx_ring *rxdr = &adapter->test_rx_ring; struct e1000_rx_ring *rxdr = &adapter->test_rx_ring;
struct pci_dev *pdev = adapter->pdev; struct pci_dev *pdev = adapter->pdev;
uint32_t rctl; uint32_t rctl;
int size, i, ret_val; int i, ret_val;
/* Setup Tx descriptor ring and Tx buffers */ /* Setup Tx descriptor ring and Tx buffers */
if (!txdr->count) if (!txdr->count)
txdr->count = E1000_DEFAULT_TXD; txdr->count = E1000_DEFAULT_TXD;
size = txdr->count * sizeof(struct e1000_buffer); if (!(txdr->buffer_info = kcalloc(txdr->count,
if (!(txdr->buffer_info = kmalloc(size, GFP_KERNEL))) { sizeof(struct e1000_buffer),
GFP_KERNEL))) {
ret_val = 1; ret_val = 1;
goto err_nomem; goto err_nomem;
} }
memset(txdr->buffer_info, 0, size);
txdr->size = txdr->count * sizeof(struct e1000_tx_desc); txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
E1000_ROUNDUP(txdr->size, 4096); E1000_ROUNDUP(txdr->size, 4096);
if (!(txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma))) { if (!(txdr->desc = pci_alloc_consistent(pdev, txdr->size,
&txdr->dma))) {
ret_val = 2; ret_val = 2;
goto err_nomem; goto err_nomem;
} }
@@ -1116,12 +1114,12 @@ e1000_setup_desc_rings(struct e1000_adapter *adapter)
if (!rxdr->count) if (!rxdr->count)
rxdr->count = E1000_DEFAULT_RXD; rxdr->count = E1000_DEFAULT_RXD;
size = rxdr->count * sizeof(struct e1000_buffer); if (!(rxdr->buffer_info = kcalloc(rxdr->count,
if (!(rxdr->buffer_info = kmalloc(size, GFP_KERNEL))) { sizeof(struct e1000_buffer),
GFP_KERNEL))) {
ret_val = 4; ret_val = 4;
goto err_nomem; goto err_nomem;
} }
memset(rxdr->buffer_info, 0, size);
rxdr->size = rxdr->count * sizeof(struct e1000_rx_desc); rxdr->size = rxdr->count * sizeof(struct e1000_rx_desc);
if (!(rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma))) { if (!(rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma))) {

29
drivers/net/e1000/e1000_main.c
View File

@@ -1354,31 +1354,27 @@ e1000_sw_init(struct e1000_adapter *adapter)
static int __devinit static int __devinit
e1000_alloc_queues(struct e1000_adapter *adapter) e1000_alloc_queues(struct e1000_adapter *adapter)
{ {
int size; adapter->tx_ring = kcalloc(adapter->num_tx_queues,
sizeof(struct e1000_tx_ring), GFP_KERNEL);
size = sizeof(struct e1000_tx_ring) * adapter->num_tx_queues;
adapter->tx_ring = kmalloc(size, GFP_KERNEL);
if (!adapter->tx_ring) if (!adapter->tx_ring)
return -ENOMEM; return -ENOMEM;
memset(adapter->tx_ring, 0, size);
size = sizeof(struct e1000_rx_ring) * adapter->num_rx_queues; adapter->rx_ring = kcalloc(adapter->num_rx_queues,
adapter->rx_ring = kmalloc(size, GFP_KERNEL); sizeof(struct e1000_rx_ring), GFP_KERNEL);
if (!adapter->rx_ring) { if (!adapter->rx_ring) {
kfree(adapter->tx_ring); kfree(adapter->tx_ring);
return -ENOMEM; return -ENOMEM;
} }
memset(adapter->rx_ring, 0, size);
#ifdef CONFIG_E1000_NAPI #ifdef CONFIG_E1000_NAPI
size = sizeof(struct net_device) * adapter->num_rx_queues; adapter->polling_netdev = kcalloc(adapter->num_rx_queues,
adapter->polling_netdev = kmalloc(size, GFP_KERNEL); sizeof(struct net_device),
GFP_KERNEL);
if (!adapter->polling_netdev) { if (!adapter->polling_netdev) {
kfree(adapter->tx_ring); kfree(adapter->tx_ring);
kfree(adapter->rx_ring); kfree(adapter->rx_ring);
return -ENOMEM; return -ENOMEM;
} }
memset(adapter->polling_netdev, 0, size);
#endif #endif
return E1000_SUCCESS; return E1000_SUCCESS;
@@ -1774,18 +1770,18 @@ e1000_setup_rx_resources(struct e1000_adapter *adapter,
} }
memset(rxdr->buffer_info, 0, size); memset(rxdr->buffer_info, 0, size);
size = sizeof(struct e1000_ps_page) * rxdr->count; rxdr->ps_page = kcalloc(rxdr->count, sizeof(struct e1000_ps_page),
rxdr->ps_page = kmalloc(size, GFP_KERNEL); GFP_KERNEL);
if (!rxdr->ps_page) { if (!rxdr->ps_page) {
vfree(rxdr->buffer_info); vfree(rxdr->buffer_info);
DPRINTK(PROBE, ERR, DPRINTK(PROBE, ERR,
"Unable to allocate memory for the receive descriptor ring\n"); "Unable to allocate memory for the receive descriptor ring\n");
return -ENOMEM; return -ENOMEM;
} }
memset(rxdr->ps_page, 0, size);
size = sizeof(struct e1000_ps_page_dma) * rxdr->count; rxdr->ps_page_dma = kcalloc(rxdr->count,
rxdr->ps_page_dma = kmalloc(size, GFP_KERNEL); sizeof(struct e1000_ps_page_dma),
GFP_KERNEL);
if (!rxdr->ps_page_dma) { if (!rxdr->ps_page_dma) {
vfree(rxdr->buffer_info); vfree(rxdr->buffer_info);
kfree(rxdr->ps_page); kfree(rxdr->ps_page);
@@ -1793,7 +1789,6 @@ e1000_setup_rx_resources(struct e1000_adapter *adapter,
"Unable to allocate memory for the receive descriptor ring\n"); "Unable to allocate memory for the receive descriptor ring\n");
return -ENOMEM; return -ENOMEM;
} }
memset(rxdr->ps_page_dma, 0, size);
if (adapter->hw.mac_type <= e1000_82547_rev_2) if (adapter->hw.mac_type <= e1000_82547_rev_2)
desc_len = sizeof(struct e1000_rx_desc); desc_len = sizeof(struct e1000_rx_desc);