From: Deepak Saxena Signed-off-by: Deepak Saxena Signed-off-by: Andrew Morton --- drivers/hwmon/adm1021.c | 3 +-- drivers/hwmon/adm1025.c | 3 +-- drivers/hwmon/adm1026.c | 4 +--- drivers/hwmon/adm1031.c | 3 +-- drivers/hwmon/asb100.c | 9 +++------ drivers/hwmon/atxp1.c | 3 +-- drivers/hwmon/ds1621.c | 3 +-- drivers/hwmon/fscher.c | 3 +-- drivers/hwmon/fscpos.c | 3 +-- drivers/hwmon/gl518sm.c | 3 +-- drivers/hwmon/gl520sm.c | 3 +-- drivers/hwmon/it87.c | 3 +-- drivers/hwmon/lm63.c | 3 +-- drivers/hwmon/lm75.c | 3 +-- drivers/hwmon/lm77.c | 3 +-- drivers/hwmon/lm78.c | 3 +-- drivers/hwmon/lm80.c | 3 +-- drivers/hwmon/lm83.c | 3 +-- drivers/hwmon/lm85.c | 3 +-- drivers/hwmon/lm87.c | 3 +-- drivers/hwmon/lm90.c | 3 +-- drivers/hwmon/lm92.c | 3 +-- drivers/hwmon/max1619.c | 3 +-- drivers/hwmon/pc87360.c | 3 +-- drivers/hwmon/sis5595.c | 3 +-- drivers/hwmon/smsc47b397.c | 3 +-- drivers/hwmon/smsc47m1.c | 3 +-- drivers/hwmon/via686a.c | 3 +-- drivers/hwmon/w83627ehf.c | 3 +-- drivers/hwmon/w83627hf.c | 3 +-- drivers/hwmon/w83781d.c | 9 +++------ drivers/hwmon/w83792d.c | 6 ++---- drivers/hwmon/w83l785ts.c | 4 +--- 33 files changed, 38 insertions(+), 78 deletions(-) diff -puN drivers/hwmon/adm1021.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/adm1021.c --- 25/drivers/hwmon/adm1021.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/adm1021.c Tue Oct 11 15:32:35 2005 @@ -204,11 +204,10 @@ static int adm1021_detect(struct i2c_ada 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); diff -puN drivers/hwmon/adm1025.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/adm1025.c --- 25/drivers/hwmon/adm1025.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/adm1025.c Tue Oct 11 15:32:35 2005 @@ -331,11 +331,10 @@ static int adm1025_detect(struct i2c_ada 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. */ diff -puN drivers/hwmon/adm1026.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/adm1026.c --- 25/drivers/hwmon/adm1026.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/adm1026.c Tue Oct 11 15:32:35 2005 @@ -1470,13 +1470,11 @@ int adm1026_detect(struct i2c_adapter *a 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; diff -puN drivers/hwmon/adm1031.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/adm1031.c --- 25/drivers/hwmon/adm1031.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/adm1031.c Tue Oct 11 15:32:35 2005 @@ -740,11 +740,10 @@ static int adm1031_detect(struct i2c_ada 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); diff -puN drivers/hwmon/asb100.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/asb100.c --- 25/drivers/hwmon/asb100.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/asb100.c Tue Oct 11 15:32:35 2005 @@ -629,19 +629,17 @@ static int asb100_detect_subclients(stru 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_adap 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))) { + if (!(data = kzalloc(sizeof(struct asb100_data), GFP_KERNEL))) { pr_debug("asb100.o: detect failed, kmalloc failed!\n"); err = -ENOMEM; goto ERROR0; } - memset(data, 0, sizeof(struct asb100_data)); new_client = &data->client; init_MUTEX(&data->lock); diff -puN drivers/hwmon/atxp1.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/atxp1.c --- 25/drivers/hwmon/atxp1.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/atxp1.c Tue Oct 11 15:32:35 2005 @@ -266,12 +266,11 @@ static int atxp1_detect(struct i2c_adapt if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) goto exit; - if (!(data = kmalloc(sizeof(struct atxp1_data), GFP_KERNEL))) { + if (!(data = kzalloc(sizeof(struct atxp1_data), GFP_KERNEL))) { err = -ENOMEM; goto exit; } - memset(data, 0, sizeof(struct atxp1_data)); new_client = &data->client; i2c_set_clientdata(new_client, data); diff -puN drivers/hwmon/ds1621.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/ds1621.c --- 25/drivers/hwmon/ds1621.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/ds1621.c Tue Oct 11 15:32:35 2005 @@ -200,11 +200,10 @@ int ds1621_detect(struct i2c_adapter *ad /* OK. For now, we presume we have a valid client. We now create the client structure, even though we cannot fill it completely yet. 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; goto exit; } - memset(data, 0, sizeof(struct ds1621_data)); new_client = &data->client; i2c_set_clientdata(new_client, data); diff -puN drivers/hwmon/fscher.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/fscher.c --- 25/drivers/hwmon/fscher.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/fscher.c Tue Oct 11 15:32:35 2005 @@ -303,11 +303,10 @@ static int fscher_detect(struct i2c_adap /* OK. For now, we presume we have a valid client. We now create the * client structure, even though we cannot fill it completely yet. * 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; goto exit; } - memset(data, 0, sizeof(struct fscher_data)); /* The common I2C client data is placed right before the * Hermes-specific data. */ diff -puN drivers/hwmon/fscpos.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/fscpos.c --- 25/drivers/hwmon/fscpos.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/fscpos.c Tue Oct 11 15:32:35 2005 @@ -453,11 +453,10 @@ int fscpos_detect(struct i2c_adapter *ad * 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; goto exit; } - memset(data, 0, sizeof(struct fscpos_data)); new_client = &data->client; i2c_set_clientdata(new_client, data); diff -puN drivers/hwmon/gl518sm.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/gl518sm.c --- 25/drivers/hwmon/gl518sm.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/gl518sm.c Tue Oct 11 15:32:35 2005 @@ -365,11 +365,10 @@ static int gl518_detect(struct i2c_adapt client structure, even though we cannot fill it completely yet. 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; goto exit; } - memset(data, 0, sizeof(struct gl518_data)); new_client = &data->client; i2c_set_clientdata(new_client, data); diff -puN drivers/hwmon/gl520sm.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/gl520sm.c --- 25/drivers/hwmon/gl520sm.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/gl520sm.c Tue Oct 11 15:32:35 2005 @@ -536,11 +536,10 @@ static int gl520_detect(struct i2c_adapt client structure, even though we cannot fill it completely yet. 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; goto exit; } - memset(data, 0, sizeof(struct gl520_data)); new_client = &data->client; i2c_set_clientdata(new_client, data); diff -puN drivers/hwmon/it87.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/it87.c --- 25/drivers/hwmon/it87.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/it87.c Tue Oct 11 15:32:35 2005 @@ -788,11 +788,10 @@ int it87_detect(struct i2c_adapter *adap client structure, even though we cannot fill it completely yet. 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; goto ERROR1; } - memset(data, 0, sizeof(struct it87_data)); new_client = &data->client; if (is_isa) diff -puN drivers/hwmon/lm63.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/lm63.c --- 25/drivers/hwmon/lm63.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/lm63.c Tue Oct 11 15:32:35 2005 @@ -375,11 +375,10 @@ static int lm63_detect(struct i2c_adapte if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) goto exit; - if (!(data = kmalloc(sizeof(struct lm63_data), GFP_KERNEL))) { + if (!(data = kzalloc(sizeof(struct lm63_data), GFP_KERNEL))) { err = -ENOMEM; goto exit; } - memset(data, 0, sizeof(struct lm63_data)); /* The common I2C client data is placed right before the LM63-specific data. */ diff -puN drivers/hwmon/lm75.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/lm75.c --- 25/drivers/hwmon/lm75.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/lm75.c Tue Oct 11 15:32:35 2005 @@ -140,11 +140,10 @@ static int lm75_detect(struct i2c_adapte /* OK. For now, we presume we have a valid client. We now create the client structure, even though we cannot fill it completely yet. 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; goto exit; } - memset(data, 0, sizeof(struct lm75_data)); new_client = &data->client; i2c_set_clientdata(new_client, data); diff -puN drivers/hwmon/lm77.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/lm77.c --- 25/drivers/hwmon/lm77.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/lm77.c Tue Oct 11 15:32:35 2005 @@ -226,11 +226,10 @@ static int lm77_detect(struct i2c_adapte /* OK. For now, we presume we have a valid client. We now create the client structure, even though we cannot fill it completely yet. 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; goto exit; } - memset(data, 0, sizeof(struct lm77_data)); new_client = &data->client; i2c_set_clientdata(new_client, data); diff -puN drivers/hwmon/lm78.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/lm78.c --- 25/drivers/hwmon/lm78.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/lm78.c Tue Oct 11 15:32:35 2005 @@ -540,11 +540,10 @@ int lm78_detect(struct i2c_adapter *adap client structure, even though we cannot fill it completely yet. 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; goto ERROR1; } - memset(data, 0, sizeof(struct lm78_data)); new_client = &data->client; if (is_isa) diff -puN drivers/hwmon/lm80.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/lm80.c --- 25/drivers/hwmon/lm80.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/lm80.c Tue Oct 11 15:32:35 2005 @@ -407,11 +407,10 @@ int lm80_detect(struct i2c_adapter *adap /* OK. For now, we presume we have a valid client. We now create the client structure, even though we cannot fill it completely yet. 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; goto exit; } - memset(data, 0, sizeof(struct lm80_data)); new_client = &data->client; i2c_set_clientdata(new_client, data); diff -puN drivers/hwmon/lm83.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/lm83.c --- 25/drivers/hwmon/lm83.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/lm83.c Tue Oct 11 15:32:35 2005 @@ -230,11 +230,10 @@ static int lm83_detect(struct i2c_adapte if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) goto exit; - if (!(data = kmalloc(sizeof(struct lm83_data), GFP_KERNEL))) { + if (!(data = kzalloc(sizeof(struct lm83_data), GFP_KERNEL))) { err = -ENOMEM; goto exit; } - memset(data, 0, sizeof(struct lm83_data)); /* The common I2C client data is placed right after the * LM83-specific data. */ diff -puN drivers/hwmon/lm85.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/lm85.c --- 25/drivers/hwmon/lm85.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/lm85.c Tue Oct 11 15:32:35 2005 @@ -1033,11 +1033,10 @@ int lm85_detect(struct i2c_adapter *adap client structure, even though we cannot fill it completely yet. 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; goto ERROR0; } - memset(data, 0, sizeof(struct lm85_data)); new_client = &data->client; i2c_set_clientdata(new_client, data); diff -puN drivers/hwmon/lm87.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/lm87.c --- 25/drivers/hwmon/lm87.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/lm87.c Tue Oct 11 15:32:35 2005 @@ -554,11 +554,10 @@ static int lm87_detect(struct i2c_adapte if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) goto exit; - if (!(data = kmalloc(sizeof(struct lm87_data), GFP_KERNEL))) { + if (!(data = kzalloc(sizeof(struct lm87_data), GFP_KERNEL))) { err = -ENOMEM; goto exit; } - memset(data, 0, sizeof(struct lm87_data)); /* The common I2C client data is placed right before the LM87-specific data. */ diff -puN drivers/hwmon/lm90.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/lm90.c --- 25/drivers/hwmon/lm90.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/lm90.c Tue Oct 11 15:32:35 2005 @@ -370,11 +370,10 @@ static int lm90_detect(struct i2c_adapte if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) goto exit; - if (!(data = kmalloc(sizeof(struct lm90_data), GFP_KERNEL))) { + if (!(data = kzalloc(sizeof(struct lm90_data), GFP_KERNEL))) { err = -ENOMEM; goto exit; } - memset(data, 0, sizeof(struct lm90_data)); /* The common I2C client data is placed right before the LM90-specific data. */ diff -puN drivers/hwmon/lm92.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/lm92.c --- 25/drivers/hwmon/lm92.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/lm92.c Tue Oct 11 15:32:35 2005 @@ -300,11 +300,10 @@ static int lm92_detect(struct i2c_adapte | I2C_FUNC_SMBUS_WORD_DATA)) goto exit; - if (!(data = kmalloc(sizeof(struct lm92_data), GFP_KERNEL))) { + if (!(data = kzalloc(sizeof(struct lm92_data), GFP_KERNEL))) { err = -ENOMEM; goto exit; } - memset(data, 0, sizeof(struct lm92_data)); /* Fill in enough client fields so that we can read from the chip, which is required for identication */ diff -puN drivers/hwmon/max1619.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/max1619.c --- 25/drivers/hwmon/max1619.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/max1619.c Tue Oct 11 15:32:35 2005 @@ -197,11 +197,10 @@ static int max1619_detect(struct i2c_ada if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) goto exit; - if (!(data = kmalloc(sizeof(struct max1619_data), GFP_KERNEL))) { + if (!(data = kzalloc(sizeof(struct max1619_data), GFP_KERNEL))) { err = -ENOMEM; goto exit; } - memset(data, 0, sizeof(struct max1619_data)); /* The common I2C client data is placed right before the MAX1619-specific data. */ diff -puN drivers/hwmon/pc87360.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/pc87360.c --- 25/drivers/hwmon/pc87360.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/pc87360.c Tue Oct 11 15:32:35 2005 @@ -754,9 +754,8 @@ static int pc87360_detect(struct i2c_ada const char *name = "pc87360"; int use_thermistors = 0; - if (!(data = kmalloc(sizeof(struct pc87360_data), GFP_KERNEL))) + if (!(data = kzalloc(sizeof(struct pc87360_data), GFP_KERNEL))) return -ENOMEM; - memset(data, 0x00, sizeof(struct pc87360_data)); new_client = &data->client; i2c_set_clientdata(new_client, data); diff -puN drivers/hwmon/sis5595.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/sis5595.c --- 25/drivers/hwmon/sis5595.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/sis5595.c Tue Oct 11 15:32:35 2005 @@ -518,11 +518,10 @@ static int sis5595_detect(struct i2c_ada goto exit_release; } - if (!(data = kmalloc(sizeof(struct sis5595_data), GFP_KERNEL))) { + if (!(data = kzalloc(sizeof(struct sis5595_data), GFP_KERNEL))) { err = -ENOMEM; goto exit_release; } - memset(data, 0, sizeof(struct sis5595_data)); new_client = &data->client; new_client->addr = address; diff -puN drivers/hwmon/smsc47b397.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/smsc47b397.c --- 25/drivers/hwmon/smsc47b397.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/smsc47b397.c Tue Oct 11 15:32:35 2005 @@ -244,11 +244,10 @@ static int smsc47b397_detect(struct i2c_ return -EBUSY; } - if (!(data = kmalloc(sizeof(struct smsc47b397_data), GFP_KERNEL))) { + if (!(data = kzalloc(sizeof(struct smsc47b397_data), GFP_KERNEL))) { err = -ENOMEM; goto error_release; } - memset(data, 0x00, sizeof(struct smsc47b397_data)); new_client = &data->client; i2c_set_clientdata(new_client, data); diff -puN drivers/hwmon/smsc47m1.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/smsc47m1.c --- 25/drivers/hwmon/smsc47m1.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/smsc47m1.c Tue Oct 11 15:32:35 2005 @@ -396,11 +396,10 @@ static int smsc47m1_detect(struct i2c_ad return -EBUSY; } - if (!(data = kmalloc(sizeof(struct smsc47m1_data), GFP_KERNEL))) { + if (!(data = kzalloc(sizeof(struct smsc47m1_data), GFP_KERNEL))) { err = -ENOMEM; goto error_release; } - memset(data, 0x00, sizeof(struct smsc47m1_data)); new_client = &data->client; i2c_set_clientdata(new_client, data); diff -puN drivers/hwmon/via686a.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/via686a.c --- 25/drivers/hwmon/via686a.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/via686a.c Tue Oct 11 15:32:35 2005 @@ -621,11 +621,10 @@ static int via686a_detect(struct i2c_ada return -ENODEV; } - if (!(data = kmalloc(sizeof(struct via686a_data), GFP_KERNEL))) { + if (!(data = kzalloc(sizeof(struct via686a_data), GFP_KERNEL))) { err = -ENOMEM; goto exit_release; } - memset(data, 0, sizeof(struct via686a_data)); new_client = &data->client; i2c_set_clientdata(new_client, data); diff -puN drivers/hwmon/w83627ehf.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/w83627ehf.c --- 25/drivers/hwmon/w83627ehf.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/w83627ehf.c Tue Oct 11 15:32:35 2005 @@ -678,11 +678,10 @@ static int w83627ehf_detect(struct i2c_a goto exit; } - if (!(data = kmalloc(sizeof(struct w83627ehf_data), GFP_KERNEL))) { + if (!(data = kzalloc(sizeof(struct w83627ehf_data), GFP_KERNEL))) { err = -ENOMEM; goto exit_release; } - memset(data, 0, sizeof(struct w83627ehf_data)); client = &data->client; i2c_set_clientdata(client, data); diff -puN drivers/hwmon/w83627hf.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/w83627hf.c --- 25/drivers/hwmon/w83627hf.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/w83627hf.c Tue Oct 11 15:32:35 2005 @@ -1041,11 +1041,10 @@ static int w83627hf_detect(struct i2c_ad client structure, even though we cannot fill it completely yet. 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; goto ERROR1; } - memset(data, 0, sizeof(struct w83627hf_data)); new_client = &data->client; i2c_set_clientdata(new_client, data); diff -puN drivers/hwmon/w83781d.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/w83781d.c --- 25/drivers/hwmon/w83781d.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/w83781d.c Tue Oct 11 15:32:35 2005 @@ -889,12 +889,11 @@ w83781d_detect_subclients(struct i2c_ada const char *client_name = ""; 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])) { err = -ENOMEM; goto ERROR_SC_0; } - memset(data->lm75[0], 0x00, sizeof (struct i2c_client)); id = i2c_adapter_id(adapter); @@ -920,12 +919,11 @@ w83781d_detect_subclients(struct i2c_ada if (kind != w83783s) { - 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], 0x0, sizeof(struct i2c_client)); if (force_subclients[0] == id && force_subclients[1] == address) { @@ -1064,11 +1062,10 @@ w83781d_detect(struct i2c_adapter *adapt client structure, even though we cannot fill it completely yet. 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; goto ERROR1; } - memset(data, 0, sizeof(struct w83781d_data)); new_client = &data->client; i2c_set_clientdata(new_client, data); diff -puN drivers/hwmon/w83792d.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/w83792d.c --- 25/drivers/hwmon/w83792d.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/w83792d.c Tue Oct 11 15:32:35 2005 @@ -1086,11 +1086,10 @@ w83792d_create_subclient(struct i2c_adap int err; 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)) { return -ENOMEM; } - memset(sub_client, 0x00, sizeof(struct i2c_client)); sub_client->addr = 0x48 + addr; i2c_set_clientdata(sub_client, NULL); sub_client->adapter = adapter; @@ -1184,11 +1183,10 @@ w83792d_detect(struct i2c_adapter *adapt client structure, even though we cannot fill it completely yet. 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; goto ERROR0; } - memset(data, 0, sizeof(struct w83792d_data)); new_client = &data->client; i2c_set_clientdata(new_client, data); diff -puN drivers/hwmon/w83l785ts.c~hwmon-kmalloc-memset-kzalloc-conversion drivers/hwmon/w83l785ts.c --- 25/drivers/hwmon/w83l785ts.c~hwmon-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:32:35 2005 +++ 25-akpm/drivers/hwmon/w83l785ts.c Tue Oct 11 15:32:35 2005 @@ -156,12 +156,10 @@ static int w83l785ts_detect(struct i2c_a if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) goto exit; - if (!(data = kmalloc(sizeof(struct w83l785ts_data), GFP_KERNEL))) { + if (!(data = kzalloc(sizeof(struct w83l785ts_data), GFP_KERNEL))) { err = -ENOMEM; goto exit; } - memset(data, 0, sizeof(struct w83l785ts_data)); - /* The common I2C client data is placed right before the * W83L785TS-specific data. */ _