Commit 8420fa7e authored by Matthias Schwarzott's avatar Matthias Schwarzott Committed by Mauro Carvalho Chehab
Browse files

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: default avatarMatthias Schwarzott <zzam@gentoo.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 51ca3bdd

drivers/media/dvb/frontends/cx24113.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/media/dvb/frontends/cx24116.c

+1 −4
Original line number Diff line number Diff line
@@ -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;

drivers/media/dvb/frontends/cx24123.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

drivers/media/dvb/frontends/lgdt3304.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/media/dvb/frontends/s921_module.c

+0 −1
Original line number Diff line number Diff line
@@ -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;