media: use pci_zalloc_consistent

Remove the now unnecessary memset too.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Mauro Carvalho Chehab <m.chehab@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 9 insertions, 11 deletions

diff --git a/drivers/media/common/saa7146/saa7146_core.c b/drivers/media/common/saa7146/saa7146_core.c
index 34b0d0ddeef3..97afee672d07 100644
--- a/drivers/media/common/saa7146/saa7146_core.c
+++ b/drivers/media/common/saa7146/saa7146_core.c
@@ -421,23 +421,20 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
         err = -ENOMEM;
 
         /* get memory for various stuff */
-        dev->d_rps0.cpu_addr = pci_alloc_consistent(pci, SAA7146_RPS_MEM,
-                                                    &dev->d_rps0.dma_handle);
+        dev->d_rps0.cpu_addr = pci_zalloc_consistent(pci, SAA7146_RPS_MEM,
+                                                     &dev->d_rps0.dma_handle);
         if (!dev->d_rps0.cpu_addr)
                 goto err_free_irq;
-        memset(dev->d_rps0.cpu_addr, 0x0, SAA7146_RPS_MEM);
 
-        dev->d_rps1.cpu_addr = pci_alloc_consistent(pci, SAA7146_RPS_MEM,
-                                                    &dev->d_rps1.dma_handle);
+        dev->d_rps1.cpu_addr = pci_zalloc_consistent(pci, SAA7146_RPS_MEM,
+                                                     &dev->d_rps1.dma_handle);
         if (!dev->d_rps1.cpu_addr)
                 goto err_free_rps0;
-        memset(dev->d_rps1.cpu_addr, 0x0, SAA7146_RPS_MEM);
 
-        dev->d_i2c.cpu_addr = pci_alloc_consistent(pci, SAA7146_RPS_MEM,
-                                                   &dev->d_i2c.dma_handle);
+        dev->d_i2c.cpu_addr = pci_zalloc_consistent(pci, SAA7146_RPS_MEM,
+                                                    &dev->d_i2c.dma_handle);
         if (!dev->d_i2c.cpu_addr)
                 goto err_free_rps1;
-        memset(dev->d_i2c.cpu_addr, 0x0, SAA7146_RPS_MEM);
 
         /* the rest + print status message */
 
diff --git a/drivers/media/common/saa7146/saa7146_fops.c b/drivers/media/common/saa7146/saa7146_fops.c
index d9e1d6395ed9..6c47f3fe9b0f 100644
--- a/drivers/media/common/saa7146/saa7146_fops.c
+++ b/drivers/media/common/saa7146/saa7146_fops.c
@@ -520,14 +520,15 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv)
            configuration data) */
         dev->ext_vv_data = ext_vv;
 
-        vv->d_clipping.cpu_addr = pci_alloc_consistent(dev->pci, SAA7146_CLIPPING_MEM, &vv->d_clipping.dma_handle);
+        vv->d_clipping.cpu_addr =
+                pci_zalloc_consistent(dev->pci, SAA7146_CLIPPING_MEM,
+                                      &vv->d_clipping.dma_handle);
         if( NULL == vv->d_clipping.cpu_addr ) {
                 ERR("out of memory. aborting.\n");
                 kfree(vv);
                 v4l2_ctrl_handler_free(hdl);
                 return -1;
         }
-        memset(vv->d_clipping.cpu_addr, 0x0, SAA7146_CLIPPING_MEM);
 
         saa7146_video_uops.init(dev,vv);
         if (dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE)