diff options
Diffstat (limited to 'drivers/hwmon/sht21.c')
| -rw-r--r-- | drivers/hwmon/sht21.c | 43 |
1 files changed, 9 insertions, 34 deletions
diff --git a/drivers/hwmon/sht21.c b/drivers/hwmon/sht21.c index 15398780cc0..2e9f9570b6f 100644 --- a/drivers/hwmon/sht21.c +++ b/drivers/hwmon/sht21.c @@ -29,6 +29,7 @@ #include <linux/err.h> #include <linux/mutex.h> #include <linux/device.h> +#include <linux/jiffies.h> /* I2C command bytes */ #define SHT21_TRIG_T_MEASUREMENT_HM 0xe3 @@ -186,7 +187,7 @@ static const struct attribute_group sht21_attr_group = { * device's name. * Returns 0 on success. */ -static int __devinit sht21_probe(struct i2c_client *client, +static int sht21_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct sht21 *sht21; @@ -199,11 +200,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 +211,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 +226,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; } @@ -236,13 +233,12 @@ fail_free: * sht21_remove() - remove device * @client: I2C client device */ -static int __devexit sht21_remove(struct i2c_client *client) +static int sht21_remove(struct i2c_client *client) { struct sht21 *sht21 = i2c_get_clientdata(client); hwmon_device_unregister(sht21->hwmon_dev); sysfs_remove_group(&client->dev.kobj, &sht21_attr_group); - kfree(sht21); return 0; } @@ -257,32 +253,11 @@ MODULE_DEVICE_TABLE(i2c, sht21_id); static struct i2c_driver sht21_driver = { .driver.name = "sht21", .probe = sht21_probe, - .remove = __devexit_p(sht21_remove), + .remove = sht21_remove, .id_table = sht21_id, }; -/** - * sht21_init() - initialize driver - * - * Called when kernel is booted or module is inserted. - * Returns 0 on success. - */ -static int __init sht21_init(void) -{ - return i2c_add_driver(&sht21_driver); -} -module_init(sht21_init); - -/** - * sht21_init() - clean up driver - * - * Called when module is removed. - */ -static void __exit sht21_exit(void) -{ - i2c_del_driver(&sht21_driver); -} -module_exit(sht21_exit); +module_i2c_driver(sht21_driver); MODULE_AUTHOR("Urs Fleisch <urs.fleisch@sensirion.com>"); MODULE_DESCRIPTION("Sensirion SHT21 humidity and temperature sensor driver"); |