renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-18 10:34:24 +08:00
Code

[PATCH] hwmon: kzalloc conversion

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

Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Deepak Saxena 2005-10-17 23:08:32 +02:00 committed by Greg Kroah-Hartman
parent 2286066faf
commit ba9c2e8d15
33 changed files with 39 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/hwmon/adm1021.c
View File

@ -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. client structure, even though we cannot fill it completely yet.
But it allows us to access adm1021_{read,write}_value. */ 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; err = -ENOMEM;
goto error0; goto error0;
} }
memset(data, 0, sizeof(struct adm1021_data));
new_client = &data->client; new_client = &data->client;
i2c_set_clientdata(new_client, data); i2c_set_clientdata(new_client, data);

3
drivers/hwmon/adm1025.c
View File

@ -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)) if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
goto exit; goto exit;
if (!(data = kmalloc(sizeof(struct adm1025_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct adm1025_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto exit; goto exit;
} }
memset(data, 0, sizeof(struct adm1025_data));
/* The common I2C client data is placed right before the /* The common I2C client data is placed right before the
ADM1025-specific data. */ ADM1025-specific data. */

4
drivers/hwmon/adm1026.c
View File

@ -1470,13 +1470,11 @@ int adm1026_detect(struct i2c_adapter *adapter, int address,
client structure, even though we cannot fill it completely yet. client structure, even though we cannot fill it completely yet.
But it allows us to access adm1026_{read,write}_value. */ 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; err = -ENOMEM;
goto exit; goto exit;
} }
memset(data, 0, sizeof(struct adm1026_data));
new_client = &data->client; new_client = &data->client;
i2c_set_clientdata(new_client, data); i2c_set_clientdata(new_client, data);
new_client->addr = address; new_client->addr = address;

3
drivers/hwmon/adm1031.c
View File

@ -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)) if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
goto exit; goto exit;
if (!(data = kmalloc(sizeof(struct adm1031_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct adm1031_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto exit; goto exit;
} }
memset(data, 0, sizeof(struct adm1031_data));
new_client = &data->client; new_client = &data->client;
i2c_set_clientdata(new_client, data); i2c_set_clientdata(new_client, data);

11
drivers/hwmon/asb100.c
View File

@ -629,19 +629,17 @@ static int asb100_detect_subclients(struct i2c_adapter *adapter, int address,
int i, id, err; int i, id, err;
struct asb100_data *data = i2c_get_clientdata(new_client); 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])) { if (!(data->lm75[0])) {
err = -ENOMEM; err = -ENOMEM;
goto ERROR_SC_0; 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])) { if (!(data->lm75[1])) {
err = -ENOMEM; err = -ENOMEM;
goto ERROR_SC_1; goto ERROR_SC_1;
} }
memset(data->lm75[1], 0x00, sizeof(struct i2c_client));
id = i2c_adapter_id(adapter); 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. client structure, even though we cannot fill it completely yet.
But it allows us to access asb100_{read,write}_value. */ But it allows us to access asb100_{read,write}_value. */
if (!(data = kmalloc(sizeof(struct asb100_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct asb100_data), GFP_KERNEL))) {
pr_debug("asb100.o: detect failed, kmalloc failed!\n"); pr_debug("asb100.o: detect failed, kzalloc failed!\n");
err = -ENOMEM; err = -ENOMEM;
goto ERROR0; goto ERROR0;
} }
memset(data, 0, sizeof(struct asb100_data));
new_client = &data->client; new_client = &data->client;
init_MUTEX(&data->lock); init_MUTEX(&data->lock);

3
drivers/hwmon/atxp1.c
View File

@ -268,12 +268,11 @@ static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind)
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
goto exit; goto exit;
if (!(data = kmalloc(sizeof(struct atxp1_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct atxp1_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto exit; goto exit;
} }
memset(data, 0, sizeof(struct atxp1_data));
new_client = &data->client; new_client = &data->client;
i2c_set_clientdata(new_client, data); i2c_set_clientdata(new_client, data);

3
drivers/hwmon/ds1621.c
View File

@ -202,11 +202,10 @@ int ds1621_detect(struct i2c_adapter *adapter, int address,
/* OK. For now, we presume we have a valid client. We now create the /* OK. For now, we presume we have a valid client. We now create the
client structure, even though we cannot fill it completely yet. client structure, even though we cannot fill it completely yet.
But it allows us to access ds1621_{read,write}_value. */ But it allows us to access ds1621_{read,write}_value. */
if (!(data = kmalloc(sizeof(struct ds1621_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct ds1621_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto exit; goto exit;
} }
memset(data, 0, sizeof(struct ds1621_data));
new_client = &data->client; new_client = &data->client;
i2c_set_clientdata(new_client, data); i2c_set_clientdata(new_client, data);

3
drivers/hwmon/fscher.c
View File

@ -303,11 +303,10 @@ static int fscher_detect(struct i2c_adapter *adapter, int address, int kind)
/* OK. For now, we presume we have a valid client. We now create the /* OK. For now, we presume we have a valid client. We now create the
* client structure, even though we cannot fill it completely yet. * client structure, even though we cannot fill it completely yet.
* But it allows us to access i2c_smbus_read_byte_data. */ * But it allows us to access i2c_smbus_read_byte_data. */
if (!(data = kmalloc(sizeof(struct fscher_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct fscher_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto exit; goto exit;
} }
memset(data, 0, sizeof(struct fscher_data));
/* The common I2C client data is placed right before the /* The common I2C client data is placed right before the
* Hermes-specific data. */ * Hermes-specific data. */

3
drivers/hwmon/fscpos.c
View File

@ -453,11 +453,10 @@ int fscpos_detect(struct i2c_adapter *adapter, int address, int kind)
* But it allows us to access fscpos_{read,write}_value. * But it allows us to access fscpos_{read,write}_value.
*/ */
if (!(data = kmalloc(sizeof(struct fscpos_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct fscpos_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto exit; goto exit;
} }
memset(data, 0, sizeof(struct fscpos_data));
new_client = &data->client; new_client = &data->client;
i2c_set_clientdata(new_client, data); i2c_set_clientdata(new_client, data);

3
drivers/hwmon/gl518sm.c
View File

@ -365,11 +365,10 @@ static int gl518_detect(struct i2c_adapter *adapter, int address, int kind)
client structure, even though we cannot fill it completely yet. client structure, even though we cannot fill it completely yet.
But it allows us to access gl518_{read,write}_value. */ But it allows us to access gl518_{read,write}_value. */
if (!(data = kmalloc(sizeof(struct gl518_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct gl518_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto exit; goto exit;
} }
memset(data, 0, sizeof(struct gl518_data));
new_client = &data->client; new_client = &data->client;
i2c_set_clientdata(new_client, data); i2c_set_clientdata(new_client, data);

3
drivers/hwmon/gl520sm.c
View File

@ -536,11 +536,10 @@ static int gl520_detect(struct i2c_adapter *adapter, int address, int kind)
client structure, even though we cannot fill it completely yet. client structure, even though we cannot fill it completely yet.
But it allows us to access gl520_{read,write}_value. */ But it allows us to access gl520_{read,write}_value. */
if (!(data = kmalloc(sizeof(struct gl520_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct gl520_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto exit; goto exit;
} }
memset(data, 0, sizeof(struct gl520_data));
new_client = &data->client; new_client = &data->client;
i2c_set_clientdata(new_client, data); i2c_set_clientdata(new_client, data);

3
drivers/hwmon/it87.c
View File

@ -761,11 +761,10 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
client structure, even though we cannot fill it completely yet. client structure, even though we cannot fill it completely yet.
But it allows us to access it87_{read,write}_value. */ But it allows us to access it87_{read,write}_value. */
if (!(data = kmalloc(sizeof(struct it87_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct it87_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto ERROR1; goto ERROR1;
} }
memset(data, 0, sizeof(struct it87_data));
new_client = &data->client; new_client = &data->client;
if (is_isa) if (is_isa)

3
drivers/hwmon/lm63.c
View File

@ -375,11 +375,10 @@ static int lm63_detect(struct i2c_adapter *adapter, int address, int kind)
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
goto exit; goto exit;
if (!(data = kmalloc(sizeof(struct lm63_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct lm63_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto exit; goto exit;
} }
memset(data, 0, sizeof(struct lm63_data));
/* The common I2C client data is placed right before the /* The common I2C client data is placed right before the
LM63-specific data. */ LM63-specific data. */

3
drivers/hwmon/lm75.c
View File

@ -127,11 +127,10 @@ static int lm75_detect(struct i2c_adapter *adapter, int address, int kind)
/* OK. For now, we presume we have a valid client. We now create the /* OK. For now, we presume we have a valid client. We now create the
client structure, even though we cannot fill it completely yet. client structure, even though we cannot fill it completely yet.
But it allows us to access lm75_{read,write}_value. */ But it allows us to access lm75_{read,write}_value. */
if (!(data = kmalloc(sizeof(struct lm75_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct lm75_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto exit; goto exit;
} }
memset(data, 0, sizeof(struct lm75_data));
new_client = &data->client; new_client = &data->client;
i2c_set_clientdata(new_client, data); i2c_set_clientdata(new_client, data);

3
drivers/hwmon/lm77.c
View File

@ -226,11 +226,10 @@ static int lm77_detect(struct i2c_adapter *adapter, int address, int kind)
/* OK. For now, we presume we have a valid client. We now create the /* OK. For now, we presume we have a valid client. We now create the
client structure, even though we cannot fill it completely yet. client structure, even though we cannot fill it completely yet.
But it allows us to access lm77_{read,write}_value. */ But it allows us to access lm77_{read,write}_value. */
if (!(data = kmalloc(sizeof(struct lm77_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct lm77_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto exit; goto exit;
} }
memset(data, 0, sizeof(struct lm77_data));
new_client = &data->client; new_client = &data->client;
i2c_set_clientdata(new_client, data); i2c_set_clientdata(new_client, data);

3
drivers/hwmon/lm78.c
View File

@ -540,11 +540,10 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
client structure, even though we cannot fill it completely yet. client structure, even though we cannot fill it completely yet.
But it allows us to access lm78_{read,write}_value. */ But it allows us to access lm78_{read,write}_value. */
if (!(data = kmalloc(sizeof(struct lm78_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct lm78_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto ERROR1; goto ERROR1;
} }
memset(data, 0, sizeof(struct lm78_data));
new_client = &data->client; new_client = &data->client;
if (is_isa) if (is_isa)

3
drivers/hwmon/lm80.c
View File

@ -407,11 +407,10 @@ int lm80_detect(struct i2c_adapter *adapter, int address, int kind)
/* OK. For now, we presume we have a valid client. We now create the /* OK. For now, we presume we have a valid client. We now create the
client structure, even though we cannot fill it completely yet. client structure, even though we cannot fill it completely yet.
But it allows us to access lm80_{read,write}_value. */ But it allows us to access lm80_{read,write}_value. */
if (!(data = kmalloc(sizeof(struct lm80_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct lm80_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto exit; goto exit;
} }
memset(data, 0, sizeof(struct lm80_data));
new_client = &data->client; new_client = &data->client;
i2c_set_clientdata(new_client, data); i2c_set_clientdata(new_client, data);

3
drivers/hwmon/lm83.c
View File

@ -230,11 +230,10 @@ static int lm83_detect(struct i2c_adapter *adapter, int address, int kind)
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
goto exit; goto exit;
if (!(data = kmalloc(sizeof(struct lm83_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct lm83_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto exit; goto exit;
} }
memset(data, 0, sizeof(struct lm83_data));
/* The common I2C client data is placed right after the /* The common I2C client data is placed right after the
* LM83-specific data. */ * LM83-specific data. */

3
drivers/hwmon/lm85.c
View File

@ -1033,11 +1033,10 @@ int lm85_detect(struct i2c_adapter *adapter, int address,
client structure, even though we cannot fill it completely yet. client structure, even though we cannot fill it completely yet.
But it allows us to access lm85_{read,write}_value. */ But it allows us to access lm85_{read,write}_value. */
if (!(data = kmalloc(sizeof(struct lm85_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct lm85_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto ERROR0; goto ERROR0;
} }
memset(data, 0, sizeof(struct lm85_data));
new_client = &data->client; new_client = &data->client;
i2c_set_clientdata(new_client, data); i2c_set_clientdata(new_client, data);

3
drivers/hwmon/lm87.c
View File

@ -554,11 +554,10 @@ static int lm87_detect(struct i2c_adapter *adapter, int address, int kind)
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
goto exit; goto exit;
if (!(data = kmalloc(sizeof(struct lm87_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct lm87_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto exit; goto exit;
} }
memset(data, 0, sizeof(struct lm87_data));
/* The common I2C client data is placed right before the /* The common I2C client data is placed right before the
LM87-specific data. */ LM87-specific data. */

3
drivers/hwmon/lm90.c
View File

@ -370,11 +370,10 @@ static int lm90_detect(struct i2c_adapter *adapter, int address, int kind)
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
goto exit; goto exit;
if (!(data = kmalloc(sizeof(struct lm90_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct lm90_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto exit; goto exit;
} }
memset(data, 0, sizeof(struct lm90_data));
/* The common I2C client data is placed right before the /* The common I2C client data is placed right before the
LM90-specific data. */ LM90-specific data. */

3
drivers/hwmon/lm92.c
View File

@ -300,11 +300,10 @@ static int lm92_detect(struct i2c_adapter *adapter, int address, int kind)
| I2C_FUNC_SMBUS_WORD_DATA)) | I2C_FUNC_SMBUS_WORD_DATA))
goto exit; goto exit;
if (!(data = kmalloc(sizeof(struct lm92_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct lm92_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto exit; goto exit;
} }
memset(data, 0, sizeof(struct lm92_data));
/* Fill in enough client fields so that we can read from the chip, /* Fill in enough client fields so that we can read from the chip,
which is required for identication */ which is required for identication */

3
drivers/hwmon/max1619.c
View File

@ -197,11 +197,10 @@ static int max1619_detect(struct i2c_adapter *adapter, int address, int kind)
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
goto exit; goto exit;
if (!(data = kmalloc(sizeof(struct max1619_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct max1619_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto exit; goto exit;
} }
memset(data, 0, sizeof(struct max1619_data));
/* The common I2C client data is placed right before the /* The common I2C client data is placed right before the
MAX1619-specific data. */ MAX1619-specific data. */

3
drivers/hwmon/pc87360.c
View File

@ -754,9 +754,8 @@ static int pc87360_detect(struct i2c_adapter *adapter)
const char *name = "pc87360"; const char *name = "pc87360";
int use_thermistors = 0; int use_thermistors = 0;
if (!(data = kmalloc(sizeof(struct pc87360_data), GFP_KERNEL))) if (!(data = kzalloc(sizeof(struct pc87360_data), GFP_KERNEL)))
return -ENOMEM; return -ENOMEM;
memset(data, 0x00, sizeof(struct pc87360_data));
new_client = &data->client; new_client = &data->client;
i2c_set_clientdata(new_client, data); i2c_set_clientdata(new_client, data);

3
drivers/hwmon/sis5595.c
View File

@ -518,11 +518,10 @@ static int sis5595_detect(struct i2c_adapter *adapter)
goto exit_release; goto exit_release;
} }
if (!(data = kmalloc(sizeof(struct sis5595_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct sis5595_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto exit_release; goto exit_release;
} }
memset(data, 0, sizeof(struct sis5595_data));
new_client = &data->client; new_client = &data->client;
new_client->addr = address; new_client->addr = address;

3
drivers/hwmon/smsc47b397.c
View File

@ -244,11 +244,10 @@ static int smsc47b397_detect(struct i2c_adapter *adapter)
return -EBUSY; return -EBUSY;
} }
if (!(data = kmalloc(sizeof(struct smsc47b397_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct smsc47b397_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto error_release; goto error_release;
} }
memset(data, 0x00, sizeof(struct smsc47b397_data));
new_client = &data->client; new_client = &data->client;
i2c_set_clientdata(new_client, data); i2c_set_clientdata(new_client, data);

3
drivers/hwmon/smsc47m1.c
View File

@ -396,11 +396,10 @@ static int smsc47m1_detect(struct i2c_adapter *adapter)
return -EBUSY; return -EBUSY;
} }
if (!(data = kmalloc(sizeof(struct smsc47m1_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct smsc47m1_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto error_release; goto error_release;
} }
memset(data, 0x00, sizeof(struct smsc47m1_data));
new_client = &data->client; new_client = &data->client;
i2c_set_clientdata(new_client, data); i2c_set_clientdata(new_client, data);

3
drivers/hwmon/via686a.c
View File

@ -621,11 +621,10 @@ static int via686a_detect(struct i2c_adapter *adapter)
return -ENODEV; return -ENODEV;
} }
if (!(data = kmalloc(sizeof(struct via686a_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct via686a_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto exit_release; goto exit_release;
} }
memset(data, 0, sizeof(struct via686a_data));
new_client = &data->client; new_client = &data->client;
i2c_set_clientdata(new_client, data); i2c_set_clientdata(new_client, data);

3
drivers/hwmon/w83627ehf.c
View File

@ -681,11 +681,10 @@ static int w83627ehf_detect(struct i2c_adapter *adapter)
goto exit; goto exit;
} }
if (!(data = kmalloc(sizeof(struct w83627ehf_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct w83627ehf_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto exit_release; goto exit_release;
} }
memset(data, 0, sizeof(struct w83627ehf_data));
client = &data->client; client = &data->client;
i2c_set_clientdata(client, data); i2c_set_clientdata(client, data);

3
drivers/hwmon/w83627hf.c
View File

@ -1045,11 +1045,10 @@ static int w83627hf_detect(struct i2c_adapter *adapter)
client structure, even though we cannot fill it completely yet. client structure, even though we cannot fill it completely yet.
But it allows us to access w83627hf_{read,write}_value. */ But it allows us to access w83627hf_{read,write}_value. */
if (!(data = kmalloc(sizeof(struct w83627hf_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct w83627hf_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto ERROR1; goto ERROR1;
} }
memset(data, 0, sizeof(struct w83627hf_data));
new_client = &data->client; new_client = &data->client;
i2c_set_clientdata(new_client, data); i2c_set_clientdata(new_client, data);

10
drivers/hwmon/w83781d.c
View File

@ -889,12 +889,11 @@ w83781d_detect_subclients(struct i2c_adapter *adapter, int address, int kind,
const char *client_name = ""; const char *client_name = "";
struct w83781d_data *data = i2c_get_clientdata(new_client); struct w83781d_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])) { if (!(data->lm75[0])) {
err = -ENOMEM; err = -ENOMEM;
goto ERROR_SC_0; goto ERROR_SC_0;
} }
memset(data->lm75[0], 0x00, sizeof (struct i2c_client));
id = i2c_adapter_id(adapter); id = i2c_adapter_id(adapter);
@ -919,13 +918,11 @@ w83781d_detect_subclients(struct i2c_adapter *adapter, int address, int kind,
} }
if (kind != w83783s) { if (kind != w83783s) {
data->lm75[1] = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
data->lm75[1] = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
if (!(data->lm75[1])) { if (!(data->lm75[1])) {
err = -ENOMEM; err = -ENOMEM;
goto ERROR_SC_1; goto ERROR_SC_1;
} }
memset(data->lm75[1], 0x0, sizeof(struct i2c_client));
if (force_subclients[0] == id && if (force_subclients[0] == id &&
force_subclients[1] == address) { force_subclients[1] == address) {
@ -1064,11 +1061,10 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
client structure, even though we cannot fill it completely yet. client structure, even though we cannot fill it completely yet.
But it allows us to access w83781d_{read,write}_value. */ But it allows us to access w83781d_{read,write}_value. */
if (!(data = kmalloc(sizeof(struct w83781d_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct w83781d_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto ERROR1; goto ERROR1;
} }
memset(data, 0, sizeof(struct w83781d_data));
new_client = &data->client; new_client = &data->client;
i2c_set_clientdata(new_client, data); i2c_set_clientdata(new_client, data);

6
drivers/hwmon/w83792d.c
View File

@ -1086,11 +1086,10 @@ w83792d_create_subclient(struct i2c_adapter *adapter,
int err; int err;
struct i2c_client *sub_client; struct i2c_client *sub_client;
(*sub_cli) = sub_client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); (*sub_cli) = sub_client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
if (!(sub_client)) { if (!(sub_client)) {
return -ENOMEM; return -ENOMEM;
} }
memset(sub_client, 0x00, sizeof(struct i2c_client));
sub_client->addr = 0x48 + addr; sub_client->addr = 0x48 + addr;
i2c_set_clientdata(sub_client, NULL); i2c_set_clientdata(sub_client, NULL);
sub_client->adapter = adapter; sub_client->adapter = adapter;
@ -1184,11 +1183,10 @@ w83792d_detect(struct i2c_adapter *adapter, int address, int kind)
client structure, even though we cannot fill it completely yet. client structure, even though we cannot fill it completely yet.
But it allows us to access w83792d_{read,write}_value. */ But it allows us to access w83792d_{read,write}_value. */
if (!(data = kmalloc(sizeof(struct w83792d_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct w83792d_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto ERROR0; goto ERROR0;
} }
memset(data, 0, sizeof(struct w83792d_data));
new_client = &data->client; new_client = &data->client;
i2c_set_clientdata(new_client, data); i2c_set_clientdata(new_client, data);

4
drivers/hwmon/w83l785ts.c
View File

@ -156,12 +156,10 @@ static int w83l785ts_detect(struct i2c_adapter *adapter, int address, int kind)
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
goto exit; goto exit;
if (!(data = kmalloc(sizeof(struct w83l785ts_data), GFP_KERNEL))) { if (!(data = kzalloc(sizeof(struct w83l785ts_data), GFP_KERNEL))) {
err = -ENOMEM; err = -ENOMEM;
goto exit; goto exit;
} }
memset(data, 0, sizeof(struct w83l785ts_data));
/* The common I2C client data is placed right before the /* The common I2C client data is placed right before the
* W83L785TS-specific data. */ * W83L785TS-specific data. */