Browse Source

micrel: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Joe Perches 11 years ago
parent
commit
a2d0abc6aa
1 changed files with 3 additions and 4 deletions
  1. 3 4
      drivers/net/ethernet/micrel/ksz884x.c

+ 3 - 4
drivers/net/ethernet/micrel/ksz884x.c

@@ -4409,14 +4409,13 @@ static int ksz_alloc_desc(struct dev_info *adapter)
 		DESC_ALIGNMENT;
 		DESC_ALIGNMENT;
 
 
 	adapter->desc_pool.alloc_virt =
 	adapter->desc_pool.alloc_virt =
-		pci_alloc_consistent(
-			adapter->pdev, adapter->desc_pool.alloc_size,
-			&adapter->desc_pool.dma_addr);
+		pci_zalloc_consistent(adapter->pdev,
+				      adapter->desc_pool.alloc_size,
+				      &adapter->desc_pool.dma_addr);
 	if (adapter->desc_pool.alloc_virt == NULL) {
 	if (adapter->desc_pool.alloc_virt == NULL) {
 		adapter->desc_pool.alloc_size = 0;
 		adapter->desc_pool.alloc_size = 0;
 		return 1;
 		return 1;
 	}
 	}
-	memset(adapter->desc_pool.alloc_virt, 0, adapter->desc_pool.alloc_size);
 
 
 	/* Align to the next cache line boundary. */
 	/* Align to the next cache line boundary. */
 	offset = (((ulong) adapter->desc_pool.alloc_virt % DESC_ALIGNMENT) ?
 	offset = (((ulong) adapter->desc_pool.alloc_virt % DESC_ALIGNMENT) ?