V4L/DVB (10662): remove redundant memset after kzalloc

Hi there!

While having a look at the allocation of struct dvb_frontend in *_attach
functions, I found some cases calling memset after kzalloc. This is
redundant, and the attached patch removes these calls.
I also changed one case calling kmalloc and memset to kzalloc.

Regards
Matthias

Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

5 files changed, 4 insertions, 9 deletions

diff --git a/drivers/media/dvb/frontends/cx24113.c b/drivers/media/dvb/frontends/cx24113.c
index f6e7b0380a5..e4fd533a427 100644
--- a/drivers/media/dvb/frontends/cx24113.c
+++ b/drivers/media/dvb/frontends/cx24113.c
@@ -559,7 +559,7 @@ struct dvb_frontend *cx24113_attach(struct dvb_frontend *fe,
                 kzalloc(sizeof(struct cx24113_state), GFP_KERNEL);
         int rc;
         if (state == NULL) {
-                err("Unable to kmalloc\n");
+                err("Unable to kzalloc\n");
                 goto error;
         }
 
diff --git a/drivers/media/dvb/frontends/cx24116.c b/drivers/media/dvb/frontends/cx24116.c
index ba1e24c8227..9b9f57264ce 100644
--- a/drivers/media/dvb/frontends/cx24116.c
+++ b/drivers/media/dvb/frontends/cx24116.c
@@ -1112,13 +1112,10 @@ struct dvb_frontend *cx24116_attach(const struct cx24116_config *config,
         dprintk("%s\n", __func__);
 
         /* allocate memory for the internal state */
-        state = kmalloc(sizeof(struct cx24116_state), GFP_KERNEL);
+        state = kzalloc(sizeof(struct cx24116_state), GFP_KERNEL);
         if (state == NULL)
                 goto error1;
 
-        /* setup the state */
-        memset(state, 0, sizeof(struct cx24116_state));
-
         state->config = config;
         state->i2c = i2c;
 
diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb/frontends/cx24123.c
index 1a8c36f7606..0592f043ea6 100644
--- a/drivers/media/dvb/frontends/cx24123.c
+++ b/drivers/media/dvb/frontends/cx24123.c
@@ -1069,13 +1069,13 @@ static struct dvb_frontend_ops cx24123_ops;
 struct dvb_frontend *cx24123_attach(const struct cx24123_config *config,
                                     struct i2c_adapter *i2c)
 {
+        /* allocate memory for the internal state */
         struct cx24123_state *state =
                 kzalloc(sizeof(struct cx24123_state), GFP_KERNEL);
 
         dprintk("\n");
-        /* allocate memory for the internal state */
         if (state == NULL) {
-                err("Unable to kmalloc\n");
+                err("Unable to kzalloc\n");
                 goto error;
         }
 
diff --git a/drivers/media/dvb/frontends/lgdt3304.c b/drivers/media/dvb/frontends/lgdt3304.c
index 3bb0c4394f8..eb72a9866c9 100644
--- a/drivers/media/dvb/frontends/lgdt3304.c
+++ b/drivers/media/dvb/frontends/lgdt3304.c
@@ -363,7 +363,6 @@ struct dvb_frontend* lgdt3304_attach(const struct lgdt3304_config *config,
 
         struct lgdt3304_state *state;
         state = kzalloc(sizeof(struct lgdt3304_state), GFP_KERNEL);
-        memset(state, 0x0, sizeof(struct lgdt3304_state));
         state->addr = config->i2c_address;
         state->i2c = i2c;
 
diff --git a/drivers/media/dvb/frontends/s921_module.c b/drivers/media/dvb/frontends/s921_module.c
index 892af8c9ed5..3f5a0e1dfdf 100644
--- a/drivers/media/dvb/frontends/s921_module.c
+++ b/drivers/media/dvb/frontends/s921_module.c
@@ -169,7 +169,6 @@ struct dvb_frontend* s921_attach(const struct s921_config *config,
 
         struct s921_state *state;
         state = kzalloc(sizeof(struct s921_state), GFP_KERNEL);
-        memset(state, 0x0, sizeof(struct s921_state));
 
         state->addr = config->i2c_address;
         state->i2c = i2c;