EEPROM: Introduce the use of devm_kzalloc
PATCH v2 1/1 EEPROM: Introduce the use of devm_kzalloc
This patch introduces the use of devm_kzalloc and does away with the kfrees in the probe and remove functions. Also, a label and the err variable are removed.
---
v2: add missing semi-colon
drivers/misc/eeprom/eeprom.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-)
drivers/misc/eeprom/eeprom.c +5 -16
@@ -159,12 +159,11 @@ static int eeprom_probe(struct i2c_client *client, {struct i2c_adapter *adapter = client->adapter;struct eeprom_data *data; -int err; -if (!(data =kzalloc (sizeof (struct eeprom_data ),GFP_KERNEL ))) { - err = -ENOMEM ; - goto exit; - } + data =devm_kzalloc (&client->dev,sizeof (struct eeprom_data ), +GFP_KERNEL ); +if (!data) +return -ENOMEM ;memset (data->data,0xff ,EEPROM_SIZE );i2c_set_clientdata (client, data);
@@ -190,22 +189,12 @@ static int eeprom_probe(struct i2c_client *client, }/* create the sysfs eeprom file */ - err =sysfs_create_bin_file (&client->dev.kobj, &eeprom_attr); -if (err) - goto exit_kfree; - -return 0 ; - -exit_kfree: -kfree (data); -exit: -return err; +return sysfs_create_bin_file (&client->dev.kobj, &eeprom_attr); }static int eeprom_remove (struct i2c_client *client) {sysfs_remove_bin_file (&client->dev.kobj, &eeprom_attr); -kfree (i2c_get_clientdata (client));return 0 ; }
Signature · 1 line
1.9.1
Hi Himangi,
Quoted 19 lines · Himangi Saraogi
This patch introduces the use of
devm_kzallocand does away with the kfrees in the probe and remove functions. Also, a label and the err variable are removed.Signed-off-by Himangi Saraogi <[email protected]>Acked-by Julia Lawall <[email protected]>---
v2: add missing semi-colondrivers/misc/eeprom/eeprom.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-)drivers/misc/eeprom/eeprom.c +0
-0@@ -159,12 +159,11 @@ static int eeprom_probe(struct i2c_client *client, {struct i2c_adapter *adapter = client->adapter;struct eeprom_data *data;
drivers/misc/eeprom/eeprom.c static int eeprom_probe(struct i2c_client *client, · line 166
Quoted 10 lines
drivers/misc/eeprom/eeprom.c +4
-5-int err; -if (!(data =kzalloc (sizeof (struct eeprom_data ),GFP_KERNEL ))) { - err = -ENOMEM ; - goto exit; - } + data =devm_kzalloc (&client->dev,sizeof (struct eeprom_data ), +GFP_KERNEL ); +if (!data) +return -ENOMEM ;
devm_kzalloc is declared in <linux/device.h> which is not included. OTOH you still include <linux/slab.h> which is no longer needed.
Other than that (and the fact that you ignored my request to switch to my new e-mail address), this looks good, thanks for the cleanup.
Quoted 27 lines
drivers/misc/eeprom/eeprom.c +1
-11memset (data->data,0xff ,EEPROM_SIZE );i2c_set_clientdata (client, data);@@ -190,22 +189,12 @@ static int eeprom_probe(struct i2c_client *client, }/* create the sysfs eeprom file */ - err =sysfs_create_bin_file (&client->dev.kobj, &eeprom_attr); -if (err) - goto exit_kfree; - -return 0 ; - -exit_kfree: -kfree (data); -exit: -return err; +return sysfs_create_bin_file (&client->dev.kobj, &eeprom_attr); }static int eeprom_remove (struct i2c_client *client) {sysfs_remove_bin_file (&client->dev.kobj, &eeprom_attr); -kfree (i2c_get_clientdata (client));return 0 ; }
Signature · 2 lines
Jean Delvare SUSE L3 Support