Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2d0abc6 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

micrel: use pci_zalloc_consistent 



Remove the now unnecessary memset too.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 12fe08b2

drivers/net/ethernet/micrel/ksz884x.c

+3 −4
Original line number Diff line number Diff line
@@ -4409,14 +4409,13 @@ static int ksz_alloc_desc(struct dev_info *adapter) 
		DESC_ALIGNMENT;



	adapter->desc_pool.alloc_virt =

		pci_alloc_consistent(

			adapter->pdev, adapter->desc_pool.alloc_size,

		pci_zalloc_consistent(adapter->pdev,

				      adapter->desc_pool.alloc_size,

				      &adapter->desc_pool.dma_addr);

	if (adapter->desc_pool.alloc_virt == NULL) {

		adapter->desc_pool.alloc_size = 0;

		return 1;

	}

	memset(adapter->desc_pool.alloc_virt, 0, adapter->desc_pool.alloc_size);



	/* Align to the next cache line boundary. */

	offset = (((ulong) adapter->desc_pool.alloc_virt % DESC_ALIGNMENT) ?