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>

2 files changed, 4 insertions, 8 deletions

diff --git a/drivers/vme/bridges/vme_ca91cx42.c b/drivers/vme/bridges/vme_ca91cx42.c
index bfb2d3f06738..18078ecbfcc6 100644
--- a/drivers/vme/bridges/vme_ca91cx42.c
+++ b/drivers/vme/bridges/vme_ca91cx42.c
@@ -1555,16 +1555,14 @@ static int ca91cx42_crcsr_init(struct vme_bridge *ca91cx42_bridge,
         }
 
         /* Allocate mem for CR/CSR image */
-        bridge->crcsr_kernel = pci_alloc_consistent(pdev, VME_CRCSR_BUF_SIZE,
-                &bridge->crcsr_bus);
+        bridge->crcsr_kernel = pci_zalloc_consistent(pdev, VME_CRCSR_BUF_SIZE,
+                                                     &bridge->crcsr_bus);
         if (bridge->crcsr_kernel == NULL) {
                 dev_err(&pdev->dev, "Failed to allocate memory for CR/CSR "
                         "image\n");
                 return -ENOMEM;
         }
 
-        memset(bridge->crcsr_kernel, 0, VME_CRCSR_BUF_SIZE);
-
         crcsr_addr = slot * (512 * 1024);
         iowrite32(bridge->crcsr_bus - crcsr_addr, bridge->base + VCSR_TO);
 
diff --git a/drivers/vme/bridges/vme_tsi148.c b/drivers/vme/bridges/vme_tsi148.c
index 61e706c0e00c..e07cfa8001bb 100644
--- a/drivers/vme/bridges/vme_tsi148.c
+++ b/drivers/vme/bridges/vme_tsi148.c
@@ -2275,16 +2275,14 @@ static int tsi148_crcsr_init(struct vme_bridge *tsi148_bridge,
         bridge = tsi148_bridge->driver_priv;
 
         /* Allocate mem for CR/CSR image */
-        bridge->crcsr_kernel = pci_alloc_consistent(pdev, VME_CRCSR_BUF_SIZE,
-                &bridge->crcsr_bus);
+        bridge->crcsr_kernel = pci_zalloc_consistent(pdev, VME_CRCSR_BUF_SIZE,
+                                                     &bridge->crcsr_bus);
         if (bridge->crcsr_kernel == NULL) {
                 dev_err(tsi148_bridge->parent, "Failed to allocate memory for "
                         "CR/CSR image\n");
                 return -ENOMEM;
         }
 
-        memset(bridge->crcsr_kernel, 0, VME_CRCSR_BUF_SIZE);
-
         reg_split(bridge->crcsr_bus, &crcsr_bus_high, &crcsr_bus_low);
 
         iowrite32be(crcsr_bus_high, bridge->base + TSI148_LCSR_CROU);