Home » Mailing list archives » linux-kernel » 2007 » August » 13

drivers/net/tokenring/3c359.c

Previous thread: [KJ] replacing kmalloc with kzalloc in drivers/net/sb1250-mac.c by Surya Prabhakar N on Monday, August 13, 2007 - 2:58 am. (2 messages)

Next thread: [PATCH 0/23] make atomic_read() and atomic_set() behavior consistent across all architectures by Chris Snook on Monday, August 13, 2007 - 3:55 am. (50 messages)
[view original message]
From: Surya Prabhakar N
Subject: drivers/net/tokenring/3c359.c
Date: Monday, August 13, 2007 - 3:13 am

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


Signed-off-by: Surya Prabhakar <surya.prabhakar@wipro.com>
---

diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index 9f1b6ab..d36dd53 100644
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -641,14 +641,14 @@ static int xl_open(struct net_device *dev)
 	 * Now to set up the Rx and Tx buffer structures
 	 */
 	/* 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) {
 		printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n",
 				     dev->name);
 		free_irq(dev->irq,dev);
 		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) {
 		printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n",
 				     dev->name);
@@ -656,8 +656,6 @@ static int xl_open(struct net_device *dev)
 		kfree(xl_priv->xl_tx_ring);
 		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 */
 	 for (i=0 ; i < XL_RX_RING_SIZE ; i++) { 

--
thanks
surya.
-


[ message continues ]
[view original message]
From: Alan Cox
Subject: Re: drivers/net/tokenring/3c359.c
Date: Monday, August 13, 2007 - 6:59 am

On Mon, 13 Aug 2007 15:43:30 +0530

Acked-by: Alan Cox <alan@redhat.com>
-


[ message continues ]
[view original message]
From: Jeff Garzik
Subject: Re: drivers/net/tokenring/3c359.c
Date: Monday, August 13, 2007 - 10:50 pm

applied


-


[ message continues ]
[view original message]
From: Sivakumar Subramani
Subject: RE: drivers/net/tokenring/3c359.c
Date: Wednesday, August 15, 2007 - 11:43 pm

What exactly the difference between kzalloc and kcalloc? From the
definition, I could see that kcalloc should be used for array
allocation. But I could see kzalloc is used for allocation arrays as in
the below patch.

Any coding standard (or) developers can use kzalloc and kcalloc as per
their coding practice??

Thanks,
~Siva
-----Original Message-----
From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org]
On Behalf Of Jeff Garzik
Sent: Tuesday, August 14, 2007 11:20 AM
To: surya.prabhakar@wipro.com
Cc: mikep@linuxtr.net; netdev@vger.kernel.org; linux-tr@linuxtr.net;
Linux Kernel; kernel-janitors
Subject: Re: drivers/net/tokenring/3c359.c


applied


-


[ message continues ]
Previous thread: [KJ] replacing kmalloc with kzalloc in drivers/net/sb1250-mac.c by Surya Prabhakar N on Monday, August 13, 2007 - 2:58 am. (2 messages)

Next thread: [PATCH 0/23] make atomic_read() and atomic_set() behavior consistent across all architectures by Chris Snook on Monday, August 13, 2007 - 3:55 am. (50 messages)