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

Commit a844af19 authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: (sht21) Convert to use devm_ functions 



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: default avatarGuenter Roeck <linux@roeck-us.net>
parent 38fe7560

drivers/hwmon/sht21.c

+4 −9
Original line number Diff line number Diff line
@@ -199,11 +199,10 @@ static int __devinit sht21_probe(struct i2c_client *client, 
		return -ENODEV;

	}



	sht21 = kzalloc(sizeof(*sht21), GFP_KERNEL);

	if (!sht21) {

		dev_dbg(&client->dev, "kzalloc failed\n");

	sht21 = devm_kzalloc(&client->dev, sizeof(*sht21), GFP_KERNEL);

	if (!sht21)

		return -ENOMEM;

	}



	i2c_set_clientdata(client, sht21);



	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);

	if (err) {

		dev_dbg(&client->dev, "could not create sysfs files\n");

		goto fail_free;

		return err;

	}

	sht21->hwmon_dev = hwmon_device_register(&client->dev);

	if (IS_ERR(sht21->hwmon_dev)) {
@@ -226,9 +225,6 @@ static int __devinit sht21_probe(struct i2c_client *client, 


fail_remove_sysfs:

	sysfs_remove_group(&client->dev.kobj, &sht21_attr_group);

fail_free:

	kfree(sht21);



	return err;

}
@@ -242,7 +238,6 @@ static int __devexit sht21_remove(struct i2c_client *client) 


	hwmon_device_unregister(sht21->hwmon_dev);

	sysfs_remove_group(&client->dev.kobj, &sht21_attr_group);

	kfree(sht21);



	return 0;

}