Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 17:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

hwmon: (sht21) Convert to use devm_ functions

Browse Source 
Convert to use devm_ functions to reduce code size and simplify the code.

Cc: Jonathan Cameron <jic23@cam.ac.uk>
Cc: Urs Fleisch <urs.fleisch@sensirion.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Guenter Roeck 2012-06-02 11:20:22 -07:00
parent 38fe7560a3
commit a844af19b9
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/hwmon/sht21.c
View File

@ -199,11 +199,10 @@ static int __devinit sht21_probe(struct i2c_client *client,
return -ENODEV; return -ENODEV;
} }
sht21 = kzalloc(sizeof(*sht21), GFP_KERNEL); sht21 = devm_kzalloc(&client->dev, sizeof(*sht21), GFP_KERNEL);
if (!sht21) { if (!sht21)
dev_dbg(&client->dev, "kzalloc failed\n");
return -ENOMEM; return -ENOMEM;
}
i2c_set_clientdata(client, sht21); i2c_set_clientdata(client, sht21);
mutex_init(&sht21->lock); mutex_init(&sht21->lock);
@ -211,7 +210,7 @@ static int __devinit sht21_probe(struct i2c_client *client,
err = sysfs_create_group(&client->dev.kobj, &sht21_attr_group); err = sysfs_create_group(&client->dev.kobj, &sht21_attr_group);
if (err) { if (err) {
dev_dbg(&client->dev, "could not create sysfs files\n"); dev_dbg(&client->dev, "could not create sysfs files\n");
goto fail_free; return err;
} }
sht21->hwmon_dev = hwmon_device_register(&client->dev); sht21->hwmon_dev = hwmon_device_register(&client->dev);
if (IS_ERR(sht21->hwmon_dev)) { if (IS_ERR(sht21->hwmon_dev)) {
@ -226,9 +225,6 @@ static int __devinit sht21_probe(struct i2c_client *client,
fail_remove_sysfs: fail_remove_sysfs:
sysfs_remove_group(&client->dev.kobj, &sht21_attr_group); sysfs_remove_group(&client->dev.kobj, &sht21_attr_group);
fail_free:
kfree(sht21);
return err; return err;
} }
@ -242,7 +238,6 @@ static int __devexit sht21_remove(struct i2c_client *client)
hwmon_device_unregister(sht21->hwmon_dev); hwmon_device_unregister(sht21->hwmon_dev);
sysfs_remove_group(&client->dev.kobj, &sht21_attr_group); sysfs_remove_group(&client->dev.kobj, &sht21_attr_group);
kfree(sht21);
return 0; return 0;
} }