net: alteon: Avoid some useless memset (721dab2b) · Commits · 戴 / test

Avoid a memset after a call to 'dma_alloc_coherent()'. This is useless since commit ("dma-mapping: zero memory returned from dma_alloc_*") Replace a kmalloc+memset with a corresponding kzalloc. Signed-off-by:

Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/ethernet/alteon/acenic.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -1151,7 +1151,7 @@ static int ace_init(struct net_device *dev)
		/*
		* Get the memory for the skb rings.
		*/
		if (!(ap->skb = kmalloc(sizeof(struct ace_skb), GFP_KERNEL))) {
		if (!(ap->skb = kzalloc(sizeof(struct ace_skb), GFP_KERNEL))) {
		ecode = -EAGAIN;
		goto init_error;
		}
		@@ -1172,9 +1172,6 @@ static int ace_init(struct net_device *dev)
		ap->last_mini_rx = 0;
		#endif

		memset(ap->info, 0, sizeof(struct ace_info));
		memset(ap->skb, 0, sizeof(struct ace_skb));

		ecode = ace_load_firmware(dev);
		if (ecode)
		goto init_error;

Admin message