Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba9c2e8d authored by Deepak Saxena's avatar Deepak Saxena Committed by Greg Kroah-Hartman
Browse files

[PATCH] hwmon: kzalloc conversion 



Use kzalloc instead of kmalloc+memset in all hardware monitoring
drivers.

Signed-off-by: default avatarDeepak Saxena <dsaxena@plexity.net>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2286066f

drivers/hwmon/adm1021.c

+1 −2
Original line number Diff line number Diff line
@@ -204,11 +204,10 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind) 
	   client structure, even though we cannot fill it completely yet.

	   But it allows us to access adm1021_{read,write}_value. */



	if (!(data = kmalloc(sizeof(struct adm1021_data), GFP_KERNEL))) {

	if (!(data = kzalloc(sizeof(struct adm1021_data), GFP_KERNEL))) {

		err = -ENOMEM;

		goto error0;

	}

	memset(data, 0, sizeof(struct adm1021_data));



	new_client = &data->client;

	i2c_set_clientdata(new_client, data);

drivers/hwmon/adm1025.c

+1 −2
Original line number Diff line number Diff line
@@ -331,11 +331,10 @@ static int adm1025_detect(struct i2c_adapter *adapter, int address, int kind) 
	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))

		goto exit;



	if (!(data = kmalloc(sizeof(struct adm1025_data), GFP_KERNEL))) {

	if (!(data = kzalloc(sizeof(struct adm1025_data), GFP_KERNEL))) {

		err = -ENOMEM;

		goto exit;

	}

	memset(data, 0, sizeof(struct adm1025_data));



	/* The common I2C client data is placed right before the

	   ADM1025-specific data. */

drivers/hwmon/adm1026.c

+1 −3
Original line number Diff line number Diff line
@@ -1470,13 +1470,11 @@ int adm1026_detect(struct i2c_adapter *adapter, int address, 
	   client structure, even though we cannot fill it completely yet.

	   But it allows us to access adm1026_{read,write}_value. */



	if (!(data = kmalloc(sizeof(struct adm1026_data), GFP_KERNEL))) {

	if (!(data = kzalloc(sizeof(struct adm1026_data), GFP_KERNEL))) {

		err = -ENOMEM;

		goto exit;

	}



	memset(data, 0, sizeof(struct adm1026_data));



	new_client = &data->client;

	i2c_set_clientdata(new_client, data);

	new_client->addr = address;

drivers/hwmon/adm1031.c

+1 −2
Original line number Diff line number Diff line
@@ -740,11 +740,10 @@ static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind) 
	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))

		goto exit;



	if (!(data = kmalloc(sizeof(struct adm1031_data), GFP_KERNEL))) {

	if (!(data = kzalloc(sizeof(struct adm1031_data), GFP_KERNEL))) {

		err = -ENOMEM;

		goto exit;

	}

	memset(data, 0, sizeof(struct adm1031_data));



	new_client = &data->client;

	i2c_set_clientdata(new_client, data);

drivers/hwmon/asb100.c

+4 −7
Original line number Diff line number Diff line
@@ -629,19 +629,17 @@ static int asb100_detect_subclients(struct i2c_adapter *adapter, int address, 
	int i, id, err;

	struct asb100_data *data = i2c_get_clientdata(new_client);



	data->lm75[0] = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);

	data->lm75[0] = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);

	if (!(data->lm75[0])) {

		err = -ENOMEM;

		goto ERROR_SC_0;

	}

	memset(data->lm75[0], 0x00, sizeof(struct i2c_client));



	data->lm75[1] = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);

	data->lm75[1] = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);

	if (!(data->lm75[1])) {

		err = -ENOMEM;

		goto ERROR_SC_1;

	}

	memset(data->lm75[1], 0x00, sizeof(struct i2c_client));



	id = i2c_adapter_id(adapter);
@@ -724,12 +722,11 @@ static int asb100_detect(struct i2c_adapter *adapter, int address, int kind) 
	   client structure, even though we cannot fill it completely yet.

	   But it allows us to access asb100_{read,write}_value. */



	if (!(data = kmalloc(sizeof(struct asb100_data), GFP_KERNEL))) {

		pr_debug("asb100.o: detect failed, kmalloc failed!\n");

	if (!(data = kzalloc(sizeof(struct asb100_data), GFP_KERNEL))) {

		pr_debug("asb100.o: detect failed, kzalloc failed!\n");

		err = -ENOMEM;

		goto ERROR0;

	}

	memset(data, 0, sizeof(struct asb100_data));



	new_client = &data->client;

	init_MUTEX(&data->lock);