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>

20 files changed, 25 insertions, 56 deletions

diff --git a/drivers/media/dvb/b2c2/flexcop.c b/drivers/media/dvb/b2c2/flexcop.c
index 123ed96f6faa..56ba52470676 100644
--- a/drivers/media/dvb/b2c2/flexcop.c
+++ b/drivers/media/dvb/b2c2/flexcop.c
@@ -220,20 +220,18 @@ EXPORT_SYMBOL(flexcop_reset_block_300);
 struct flexcop_device *flexcop_device_kmalloc(size_t bus_specific_len)
 {
         void *bus;
-        struct flexcop_device *fc = kmalloc(sizeof(struct flexcop_device), GFP_KERNEL);
+        struct flexcop_device *fc = kzalloc(sizeof(struct flexcop_device), GFP_KERNEL);
         if (!fc) {
                 err("no memory");
                 return NULL;
         }
-        memset(fc, 0, sizeof(struct flexcop_device));
 
-        bus = kmalloc(bus_specific_len, GFP_KERNEL);
+        bus = kzalloc(bus_specific_len, GFP_KERNEL);
         if (!bus) {
                 err("no memory");
                 kfree(fc);
                 return NULL;
         }
-        memset(bus, 0, bus_specific_len);
 
         fc->bus_specific = bus;
 
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 01b4e0aac049..f65f64b00ff3 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -786,10 +786,9 @@ static int dvb_bt8xx_probe(struct device *dev)
         struct pci_dev* bttv_pci_dev;
         int ret;
 
-        if (!(card = kmalloc(sizeof(struct dvb_bt8xx_card), GFP_KERNEL)))
+        if (!(card = kzalloc(sizeof(struct dvb_bt8xx_card), GFP_KERNEL)))
                 return -ENOMEM;
 
-        memset(card, 0, sizeof(*card));
         init_MUTEX(&card->lock);
         card->bttv_nr = sub->core->nr;
         strncpy(card->card_name, sub->core->name, sizeof(sub->core->name));
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
index 4bb779aeff6a..00347a750681 100644
--- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
@@ -1649,21 +1649,17 @@ int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter,
                 return -EINVAL;
 
         /* initialise the system data */
-        if ((ca =
-             (struct dvb_ca_private *) kmalloc(sizeof(struct dvb_ca_private),
-                                               GFP_KERNEL)) == NULL) {
+        if ((ca = kzalloc(sizeof(struct dvb_ca_private), GFP_KERNEL)) == NULL) {
                 ret = -ENOMEM;
                 goto error;
         }
-        memset(ca, 0, sizeof(struct dvb_ca_private));
         ca->pub = pubca;
         ca->flags = flags;
         ca->slot_count = slot_count;
-        if ((ca->slot_info = kmalloc(sizeof(struct dvb_ca_slot) * slot_count, GFP_KERNEL)) == NULL) {
+        if ((ca->slot_info = kcalloc(slot_count, sizeof(struct dvb_ca_slot), GFP_KERNEL)) == NULL) {
                 ret = -ENOMEM;
                 goto error;
         }
-        memset(ca->slot_info, 0, sizeof(struct dvb_ca_slot) * slot_count);
         init_waitqueue_head(&ca->wait_queue);
         ca->thread_pid = 0;
         init_waitqueue_head(&ca->thread_queue);
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 4a08c4ab6730..771f32d889e6 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -1024,13 +1024,12 @@ int dvb_register_frontend(struct dvb_adapter* dvb,
         if (down_interruptible (&frontend_mutex))
                 return -ERESTARTSYS;
 
-        fe->frontend_priv = kmalloc(sizeof(struct dvb_frontend_private), GFP_KERNEL);
+        fe->frontend_priv = kzalloc(sizeof(struct dvb_frontend_private), GFP_KERNEL);
         if (fe->frontend_priv == NULL) {
                 up(&frontend_mutex);
                 return -ENOMEM;
         }
         fepriv = fe->frontend_priv;
-        memset(fe->frontend_priv, 0, sizeof(struct dvb_frontend_private));
 
         init_MUTEX (&fepriv->sem);
         init_waitqueue_head (&fepriv->wait_queue);
diff --git a/drivers/media/dvb/dvb-usb/dtt200u-fe.c b/drivers/media/dvb/dvb-usb/dtt200u-fe.c
index 0a94ec22aeb8..cd21ddbfd054 100644
--- a/drivers/media/dvb/dvb-usb/dtt200u-fe.c
+++ b/drivers/media/dvb/dvb-usb/dtt200u-fe.c
@@ -156,10 +156,9 @@ struct dvb_frontend* dtt200u_fe_attach(struct dvb_usb_device *d)
         struct dtt200u_fe_state* state = NULL;
 
         /* allocate memory for the internal state */
-        state = (struct dtt200u_fe_state*) kmalloc(sizeof(struct dtt200u_fe_state), GFP_KERNEL);
+        state = kzalloc(sizeof(struct dtt200u_fe_state), GFP_KERNEL);
         if (state == NULL)
                 goto error;
-        memset(state,0,sizeof(struct dtt200u_fe_state));
 
         deb_info("attaching frontend dtt200u\n");
 
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-init.c b/drivers/media/dvb/dvb-usb/dvb-usb-init.c
index 2e23060cbbca..716f8bf528cd 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-init.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-init.c
@@ -154,12 +154,11 @@ int dvb_usb_device_init(struct usb_interface *intf, struct dvb_usb_properties
         }
 
         info("found a '%s' in warm state.",desc->name);
-        d = kmalloc(sizeof(struct dvb_usb_device),GFP_KERNEL);
+                d = kzalloc(sizeof(struct dvb_usb_device),GFP_KERNEL);
         if (d == NULL) {
                 err("no memory for 'struct dvb_usb_device'");
                 return ret;
         }
-        memset(d,0,sizeof(struct dvb_usb_device));
 
         d->udev = udev;
         memcpy(&d->props,props,sizeof(struct dvb_usb_properties));
@@ -167,13 +166,12 @@ int dvb_usb_device_init(struct usb_interface *intf, struct dvb_usb_properties
         d->owner = owner;
 
         if (d->props.size_of_priv > 0) {
-                d->priv = kmalloc(d->props.size_of_priv,GFP_KERNEL);
+                        d->priv = kzalloc(d->props.size_of_priv,GFP_KERNEL);
                 if (d->priv == NULL) {
                         err("no memory for priv in 'struct dvb_usb_device'");
                         kfree(d);
                         return -ENOMEM;
                 }
-                memset(d->priv,0,d->props.size_of_priv);
         }
 
         usb_set_intfdata(intf, d);
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c b/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
index 36b7048c02d2..ee821974dc60 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
@@ -175,15 +175,13 @@ static int dvb_usb_allocate_stream_buffers(struct dvb_usb_device *d, int num, un
 
         deb_mem("all in all I will use %lu bytes for streaming\n",num*size);
 
-        if ((d->buf_list = kmalloc(num*sizeof(u8 *), GFP_ATOMIC)) == NULL)
+        if ((d->buf_list = kcalloc(num, sizeof(u8 *), GFP_ATOMIC)) == NULL)
                 return -ENOMEM;
 
-        if ((d->dma_addr = kmalloc(num*sizeof(dma_addr_t), GFP_ATOMIC)) == NULL) {
+        if ((d->dma_addr = kcalloc(num, sizeof(dma_addr_t), GFP_ATOMIC)) == NULL) {
                 kfree(d->buf_list);
                 return -ENOMEM;
         }
-        memset(d->buf_list,0,num*sizeof(u8 *));
-        memset(d->dma_addr,0,num*sizeof(dma_addr_t));
 
         d->state |= DVB_USB_STATE_URB_BUF;
 
@@ -285,10 +283,9 @@ int dvb_usb_urb_init(struct dvb_usb_device *d)
         usb_clear_halt(d->udev,usb_rcvbulkpipe(d->udev,d->props.urb.endpoint));
 
         /* allocate the array for the data transfer URBs */
-        d->urb_list = kmalloc(d->props.urb.count * sizeof(struct urb *),GFP_KERNEL);
+        d->urb_list = kzalloc(d->props.urb.count * sizeof(struct urb *),GFP_KERNEL);
         if (d->urb_list == NULL)
                 return -ENOMEM;
-        memset(d->urb_list,0,d->props.urb.count * sizeof(struct urb *));
         d->state |= DVB_USB_STATE_URB_LIST;
 
         switch (d->props.urb.type) {
diff --git a/drivers/media/dvb/dvb-usb/vp702x-fe.c b/drivers/media/dvb/dvb-usb/vp702x-fe.c
index 0885d9fb2bf2..b6d95e1c9c52 100644
--- a/drivers/media/dvb/dvb-usb/vp702x-fe.c
+++ b/drivers/media/dvb/dvb-usb/vp702x-fe.c
@@ -281,10 +281,9 @@ static struct dvb_frontend_ops vp702x_fe_ops;
 
 struct dvb_frontend * vp702x_fe_attach(struct dvb_usb_device *d)
 {
-        struct vp702x_fe_state *s = kmalloc(sizeof(struct vp702x_fe_state), GFP_KERNEL);
+        struct vp702x_fe_state *s = kzalloc(sizeof(struct vp702x_fe_state), GFP_KERNEL);
         if (s == NULL)
                 goto error;
-        memset(s,0,sizeof(struct vp702x_fe_state));
 
         s->d = d;
         s->fe.ops = &vp702x_fe_ops;
diff --git a/drivers/media/dvb/dvb-usb/vp7045-fe.c b/drivers/media/dvb/dvb-usb/vp7045-fe.c
index 83f1de1e7e57..5242cca5db4a 100644
--- a/drivers/media/dvb/dvb-usb/vp7045-fe.c
+++ b/drivers/media/dvb/dvb-usb/vp7045-fe.c
@@ -145,10 +145,9 @@ static struct dvb_frontend_ops vp7045_fe_ops;
 
 struct dvb_frontend * vp7045_fe_attach(struct dvb_usb_device *d)
 {
-        struct vp7045_fe_state *s = kmalloc(sizeof(struct vp7045_fe_state), GFP_KERNEL);
+        struct vp7045_fe_state *s = kzalloc(sizeof(struct vp7045_fe_state), GFP_KERNEL);
         if (s == NULL)
                 goto error;
-        memset(s,0,sizeof(struct vp7045_fe_state));
 
         s->d = d;
         s->fe.ops = &vp7045_fe_ops;
diff --git a/drivers/media/dvb/frontends/bcm3510.c b/drivers/media/dvb/frontends/bcm3510.c
index 3b132bafd4de..caaee893ca76 100644
--- a/drivers/media/dvb/frontends/bcm3510.c
+++ b/drivers/media/dvb/frontends/bcm3510.c
@@ -782,10 +782,9 @@ struct dvb_frontend* bcm3510_attach(const struct bcm3510_config *config,
         bcm3510_register_value v;
 
         /* allocate memory for the internal state */
-        state = kmalloc(sizeof(struct bcm3510_state), GFP_KERNEL);
+        state = kzalloc(sizeof(struct bcm3510_state), GFP_KERNEL);
         if (state == NULL)
                 goto error;
-        memset(state,0,sizeof(struct bcm3510_state));
 
         /* setup the state */
 
diff --git a/drivers/media/dvb/frontends/dib3000mb.c b/drivers/media/dvb/frontends/dib3000mb.c
index 6b0553608610..ae589adb1c0a 100644
--- a/drivers/media/dvb/frontends/dib3000mb.c
+++ b/drivers/media/dvb/frontends/dib3000mb.c
@@ -700,10 +700,9 @@ struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
         struct dib3000_state* state = NULL;
 
         /* allocate memory for the internal state */
-        state = kmalloc(sizeof(struct dib3000_state), GFP_KERNEL);
+        state = kzalloc(sizeof(struct dib3000_state), GFP_KERNEL);
         if (state == NULL)
                 goto error;
-        memset(state,0,sizeof(struct dib3000_state));
 
         /* setup the state */
         state->i2c = i2c;
diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb/frontends/dib3000mc.c
index c024fad17337..3b303dbb6156 100644
--- a/drivers/media/dvb/frontends/dib3000mc.c
+++ b/drivers/media/dvb/frontends/dib3000mc.c
@@ -832,10 +832,9 @@ struct dvb_frontend* dib3000mc_attach(const struct dib3000_config* config,
         u16 devid;
 
         /* allocate memory for the internal state */
-        state = kmalloc(sizeof(struct dib3000_state), GFP_KERNEL);
+        state = kzalloc(sizeof(struct dib3000_state), GFP_KERNEL);
         if (state == NULL)
                 goto error;
-        memset(state,0,sizeof(struct dib3000_state));
 
         /* setup the state */
         state->i2c = i2c;
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c
index 9d214643b87a..4691ac54bc1d 100644
--- a/drivers/media/dvb/frontends/lgdt330x.c
+++ b/drivers/media/dvb/frontends/lgdt330x.c
@@ -714,10 +714,9 @@ struct dvb_frontend* lgdt330x_attach(const struct lgdt330x_config* config,
         u8 buf[1];
 
         /* Allocate memory for the internal state */
-        state = (struct lgdt330x_state*) kmalloc(sizeof(struct lgdt330x_state), GFP_KERNEL);
+        state = kzalloc(sizeof(struct lgdt330x_state), GFP_KERNEL);
         if (state == NULL)
                 goto error;
-        memset(state,0,sizeof(*state));
 
         /* Setup the state */
         state->config = config;
diff --git a/drivers/media/dvb/frontends/mt352.c b/drivers/media/dvb/frontends/mt352.c
index f0c610f2c2df..aaaec909ddf8 100644
--- a/drivers/media/dvb/frontends/mt352.c
+++ b/drivers/media/dvb/frontends/mt352.c
@@ -535,9 +535,8 @@ struct dvb_frontend* mt352_attach(const struct mt352_config* config,
         struct mt352_state* state = NULL;
 
         /* allocate memory for the internal state */
-        state = kmalloc(sizeof(struct mt352_state), GFP_KERNEL);
+        state = kzalloc(sizeof(struct mt352_state), GFP_KERNEL);
         if (state == NULL) goto error;
-        memset(state,0,sizeof(*state));
 
         /* setup the state */
         state->i2c = i2c;
diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c
index aeafef46e3eb..78d2b93d35b9 100644
--- a/drivers/media/dvb/frontends/nxt200x.c
+++ b/drivers/media/dvb/frontends/nxt200x.c
@@ -1110,10 +1110,9 @@ struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config,
         u8 buf [] = {0,0,0,0,0};
 
         /* allocate memory for the internal state */
-        state = (struct nxt200x_state*) kmalloc(sizeof(struct nxt200x_state), GFP_KERNEL);
+        state = kzalloc(sizeof(struct nxt200x_state), GFP_KERNEL);
         if (state == NULL)
                 goto error;
-        memset(state,0,sizeof(*state));
 
         /* setup the state */
         state->config = config;
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c
index bbebd1c4caca..1c5316e209ef 100644
--- a/drivers/media/dvb/pluto2/pluto2.c
+++ b/drivers/media/dvb/pluto2/pluto2.c
@@ -584,11 +584,10 @@ static int __devinit pluto2_probe(struct pci_dev *pdev,
         struct dmx_demux *dmx;
         int ret = -ENOMEM;
 
-        pluto = kmalloc(sizeof(struct pluto), GFP_KERNEL);
+        pluto = kzalloc(sizeof(struct pluto), GFP_KERNEL);
         if (!pluto)
                 goto out;
 
-        memset(pluto, 0, sizeof(struct pluto));
         pluto->pdev = pdev;
 
         ret = pci_enable_device(pdev);
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 8ce4146f55f1..327a8089193b 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -2565,14 +2565,12 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d
         }
 
         /* prepare the av7110 device struct */
-        av7110 = kmalloc(sizeof(struct av7110), GFP_KERNEL);
+        av7110 = kzalloc(sizeof(struct av7110), GFP_KERNEL);
         if (!av7110) {
                 dprintk(1, "out of memory\n");
                 return -ENOMEM;
         }
 
-        memset(av7110, 0, sizeof(struct av7110));
-
         av7110->card_name = (char*) pci_ext->ext_priv;
         av7110->dev = dev;
         dev->ext_priv = av7110;
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index f9d00452e639..aa2645895769 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -1027,11 +1027,9 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
 
         dprintk(2, "dev: %p\n", dev);
 
-        if (!(budget_av = kmalloc(sizeof(struct budget_av), GFP_KERNEL)))
+        if (!(budget_av = kzalloc(sizeof(struct budget_av), GFP_KERNEL)))
                 return -ENOMEM;
 
-        memset(budget_av, 0, sizeof(struct budget_av));
-
         budget_av->has_saa7113 = 0;
         budget_av->budget.ci_present = 0;
 
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index 104df610dbe1..5a13c4744f61 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -1489,11 +1489,9 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
 
         if (intf->altsetting->desc.bInterfaceNumber != 1) return -ENODEV;
 
-        if (!(ttusb = kmalloc(sizeof(struct ttusb), GFP_KERNEL)))
+        if (!(ttusb = kzalloc(sizeof(struct ttusb), GFP_KERNEL)))
                 return -ENOMEM;
 
-        memset(ttusb, 0, sizeof(struct ttusb));
-
         ttusb->dev = udev;
         ttusb->c = 0;
         ttusb->mux_state = 0;
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index d8966d1d25ee..df831171e03c 100644
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -1606,15 +1606,13 @@ static int ttusb_dec_probe(struct usb_interface *intf,
 
         udev = interface_to_usbdev(intf);
 
-        if (!(dec = kmalloc(sizeof(struct ttusb_dec), GFP_KERNEL))) {
+        if (!(dec = kzalloc(sizeof(struct ttusb_dec), GFP_KERNEL))) {
                 printk("%s: couldn't allocate memory.\n", __FUNCTION__);
                 return -ENOMEM;
         }
 
         usb_set_intfdata(intf, (void *)dec);
 
-        memset(dec, 0, sizeof(struct ttusb_dec));
-
         switch (le16_to_cpu(id->idProduct)) {
         case 0x1006:
                 ttusb_dec_set_model(dec, TTUSB_DEC3000S);