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

drivers/net/tokenring/3c359.c

Browse Source 
Hi,
   Replacing kmalloc with kzalloc and cleaning up memset in
drivers/net/tokenring/3c359.c

Signed-off-by: Surya Prabhakar <surya.prabhakar@wipro.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Surya Prabhakar N
2007-08-13 15:43:30 +05:30
committed by David S. Miller
parent b1c9e0f780
commit c821d55c67
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/tokenring/3c359.c
View File

@@ -641,14 +641,14 @@ static int xl_open(struct net_device *dev)
* Now to set up the Rx and Tx buffer structures * Now to set up the Rx and Tx buffer structures
*/ */
/* These MUST be on 8 byte boundaries */ /* These MUST be on 8 byte boundaries */
xl_priv->xl_tx_ring = kmalloc((sizeof(struct xl_tx_desc) * XL_TX_RING_SIZE) + 7, GFP_DMA | GFP_KERNEL) ; xl_priv->xl_tx_ring = kzalloc((sizeof(struct xl_tx_desc) * XL_TX_RING_SIZE) + 7, GFP_DMA | GFP_KERNEL);
if (xl_priv->xl_tx_ring == NULL) { if (xl_priv->xl_tx_ring == NULL) {
printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n", printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n",
dev->name); dev->name);
free_irq(dev->irq,dev); free_irq(dev->irq,dev);
return -ENOMEM; return -ENOMEM;
} }
xl_priv->xl_rx_ring = kmalloc((sizeof(struct xl_rx_desc) * XL_RX_RING_SIZE) +7, GFP_DMA | GFP_KERNEL) ; xl_priv->xl_rx_ring = kzalloc((sizeof(struct xl_rx_desc) * XL_RX_RING_SIZE) +7, GFP_DMA | GFP_KERNEL);
if (xl_priv->xl_tx_ring == NULL) { if (xl_priv->xl_tx_ring == NULL) {
printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n", printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n",
dev->name); dev->name);
@@ -656,8 +656,6 @@ static int xl_open(struct net_device *dev)
kfree(xl_priv->xl_tx_ring); kfree(xl_priv->xl_tx_ring);
return -ENOMEM; return -ENOMEM;
} }
memset(xl_priv->xl_tx_ring,0,sizeof(struct xl_tx_desc) * XL_TX_RING_SIZE) ;
memset(xl_priv->xl_rx_ring,0,sizeof(struct xl_rx_desc) * XL_RX_RING_SIZE) ;
/* Setup Rx Ring */ /* Setup Rx Ring */
for (i=0 ; i < XL_RX_RING_SIZE ; i++) { for (i=0 ; i < XL_RX_RING_SIZE ; i++) {