Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

vme: bridges: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Martyn Welch <martyn.welch@ge.com>
Cc: Manohar Vanga <manohar.vanga@gmail.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Joe Perches and committed by
Linus Torvalds
88b2608c d54d7796

+4 -8
+2 -4
drivers/vme/bridges/vme_ca91cx42.c
··· 1555 1555 } 1556 1556 1557 1557 /* Allocate mem for CR/CSR image */ 1558 - bridge->crcsr_kernel = pci_alloc_consistent(pdev, VME_CRCSR_BUF_SIZE, 1559 - &bridge->crcsr_bus); 1558 + bridge->crcsr_kernel = pci_zalloc_consistent(pdev, VME_CRCSR_BUF_SIZE, 1559 + &bridge->crcsr_bus); 1560 1560 if (bridge->crcsr_kernel == NULL) { 1561 1561 dev_err(&pdev->dev, "Failed to allocate memory for CR/CSR " 1562 1562 "image\n"); 1563 1563 return -ENOMEM; 1564 1564 } 1565 - 1566 - memset(bridge->crcsr_kernel, 0, VME_CRCSR_BUF_SIZE); 1567 1565 1568 1566 crcsr_addr = slot * (512 * 1024); 1569 1567 iowrite32(bridge->crcsr_bus - crcsr_addr, bridge->base + VCSR_TO);
+2 -4
drivers/vme/bridges/vme_tsi148.c
··· 2275 2275 bridge = tsi148_bridge->driver_priv; 2276 2276 2277 2277 /* Allocate mem for CR/CSR image */ 2278 - bridge->crcsr_kernel = pci_alloc_consistent(pdev, VME_CRCSR_BUF_SIZE, 2279 - &bridge->crcsr_bus); 2278 + bridge->crcsr_kernel = pci_zalloc_consistent(pdev, VME_CRCSR_BUF_SIZE, 2279 + &bridge->crcsr_bus); 2280 2280 if (bridge->crcsr_kernel == NULL) { 2281 2281 dev_err(tsi148_bridge->parent, "Failed to allocate memory for " 2282 2282 "CR/CSR image\n"); 2283 2283 return -ENOMEM; 2284 2284 } 2285 - 2286 - memset(bridge->crcsr_kernel, 0, VME_CRCSR_BUF_SIZE); 2287 2285 2288 2286 reg_split(bridge->crcsr_bus, &crcsr_bus_high, &crcsr_bus_low); 2289 2287