V4L/DVB (3344a): Conversions from kmalloc+memset to k(z|c)alloc

Conversions from kmalloc+memset to k(z|c)alloc.

Signed-off-by: Panagiotis Issaris <takis@issaris.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

4 files changed, 6 insertions, 12 deletions

diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index a49062119313..a502a4d6e4ae 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1539,10 +1539,9 @@ static int mpeg_open(struct inode *inode, struct file *file)
         dprintk(1,"open minor=%d\n",minor);
 
         /* allocate + initialize per filehandle data */
-        fh = kmalloc(sizeof(*fh),GFP_KERNEL);
+        fh = kzalloc(sizeof(*fh),GFP_KERNEL);
         if (NULL == fh)
                 return -ENOMEM;
-        memset(fh,0,sizeof(*fh));
         file->private_data = fh;
         fh->dev      = dev;
 
@@ -1678,10 +1677,9 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev,
                 goto fail_core;
 
         err = -ENOMEM;
-        dev = kmalloc(sizeof(*dev),GFP_KERNEL);
+        dev = kzalloc(sizeof(*dev),GFP_KERNEL);
         if (NULL == dev)
                 goto fail_core;
-        memset(dev,0,sizeof(*dev));
         dev->pci = pci_dev;
         dev->core = core;
         dev->width = 720;
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index 9975be1aca38..194446f28c55 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -1050,11 +1050,10 @@ struct cx88_core* cx88_core_get(struct pci_dev *pci)
                 up(&devlist);
                 return core;
         }
-        core = kmalloc(sizeof(*core),GFP_KERNEL);
+        core = kzalloc(sizeof(*core),GFP_KERNEL);
         if (NULL == core)
                 goto fail_unlock;
 
-        memset(core,0,sizeof(*core));
         atomic_inc(&core->refcount);
         core->pci_bus  = pci->bus->number;
         core->pci_slot = PCI_SLOT(pci->devfn);
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 42c012aaa849..e48aa3f6e500 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -657,10 +657,9 @@ static int __devinit dvb_probe(struct pci_dev *pci_dev,
                 goto fail_core;
 
         err = -ENOMEM;
-        dev = kmalloc(sizeof(*dev),GFP_KERNEL);
+        dev = kzalloc(sizeof(*dev),GFP_KERNEL);
         if (NULL == dev)
                 goto fail_core;
-        memset(dev,0,sizeof(*dev));
         dev->pci = pci_dev;
         dev->core = core;
 
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 9a02515fe18b..073494ceab0f 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -750,10 +750,9 @@ static int video_open(struct inode *inode, struct file *file)
                 minor,radio,v4l2_type_names[type]);
 
         /* allocate + initialize per filehandle data */
-        fh = kmalloc(sizeof(*fh),GFP_KERNEL);
+        fh = kzalloc(sizeof(*fh),GFP_KERNEL);
         if (NULL == fh)
                 return -ENOMEM;
-        memset(fh,0,sizeof(*fh));
         file->private_data = fh;
         fh->dev      = dev;
         fh->radio    = radio;
@@ -1809,10 +1808,9 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
         struct cx88_core *core;
         int err;
 
-        dev = kmalloc(sizeof(*dev),GFP_KERNEL);
+        dev = kzalloc(sizeof(*dev),GFP_KERNEL);
         if (NULL == dev)
                 return -ENOMEM;
-        memset(dev,0,sizeof(*dev));
 
         /* pci init */
         dev->pci = pci_dev;