hwmon: (lm95245) Convert to use devm_hwmon_device_register_with_groups
Guenter Roeck
maintainerPATCH v2 2/4 hwmon: (lm95245) Convert to use devm_hwmon_device_register_with_groups
Simplify code, reduce code size, and attach hwmon attributes to hwmon device.
---
v2: Adjust to changes in 1st patch
drivers/hwmon/lm95245.c | 82 ++++++++++++++++------------------------------- 1 file changed, 27 insertions(+), 55 deletions(-)
drivers/hwmon/lm95245.c +27 -55
@@ -115,7 +115,7 @@ static const u8 lm95245_reg_address[] = {/* Client data (each client gets its own) */ struct lm95245_data { -struct device *hwmon_dev; +struct i2c_client *client;struct mutex update_lock;unsigned long last_updated;/* in jiffies */ unsigned long interval;/* in msecs */
@@ -140,8 +140,8 @@ static int temp_from_reg_signed(u8 val_h, u8 val_l)static struct lm95245_data *lm95245_update_device (struct device *dev) { -struct i2c_client *client =to_i2c_client (dev); -struct lm95245_data *data =i2c_get_clientdata (client); +struct lm95245_data *data =dev_get_drvdata (dev); +struct i2c_client *client = data->client;mutex_lock (&data->update_lock);
@@ -149,7 +149,7 @@ static struct lm95245_data *lm95245_update_device(struct device *dev) + msecs_to_jiffies(data->interval)) || !data->valid) {int i; -dev_dbg (&client->dev,"Updating lm95245 data.\n" ); +dev_dbg (dev,"Updating lm95245 data.\n" );for (i =0 ; i <ARRAY_SIZE (lm95245_reg_address); i++) data->regs[i] = i2c_smbus_read_byte_data(client,
@@ -249,9 +249,9 @@ static ssize_t show_limit(struct device *dev, struct device_attribute *attr,static ssize_t set_limit (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) { -struct i2c_client *client =to_i2c_client (dev); -struct lm95245_data *data =i2c_get_clientdata (client); +struct lm95245_data *data =dev_get_drvdata (dev);int index =to_sensor_dev_attr (attr)->index; +struct i2c_client *client = data->client;unsigned long val;if (kstrtoul (buf,10 , &val) <0 )
@@ -285,9 +285,9 @@ static ssize_t show_crit_hyst(struct device *dev, struct device_attribute *attr,static ssize_t set_crit_hyst (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) { -struct i2c_client *client =to_i2c_client (dev); -struct lm95245_data *data =i2c_get_clientdata (client); +struct lm95245_data *data =dev_get_drvdata (dev);int index =to_sensor_dev_attr (attr)->index; +struct i2c_client *client = data->client;unsigned long val;long hyst;int limit;
@@ -314,8 +314,7 @@ static ssize_t set_crit_hyst(struct device *dev, struct device_attribute *attr,static ssize_t show_type (struct device *dev,struct device_attribute *attr,char *buf) { -struct i2c_client *client =to_i2c_client (dev); -struct lm95245_data *data =i2c_get_clientdata (client); +struct lm95245_data *data =dev_get_drvdata (dev);return snprintf (buf,PAGE_SIZE -1 , data->config2 &CFG2_REMOTE_TT ?"1\n" :"2\n" );
@@ -324,8 +323,8 @@ static ssize_t show_type(struct device *dev, struct device_attribute *attr,static ssize_t set_type (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) { -struct i2c_client *client =to_i2c_client (dev); -struct lm95245_data *data =i2c_get_clientdata (client); +struct lm95245_data *data =dev_get_drvdata (dev); +struct i2c_client *client = data->client;unsigned long val;if (kstrtoul (buf,10 , &val) <0 )
@@ -371,8 +370,8 @@ static ssize_t show_interval(struct device *dev, struct device_attribute *attr,static ssize_t set_interval (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) { -struct i2c_client *client =to_i2c_client (dev); -struct lm95245_data *data =i2c_get_clientdata (client); +struct lm95245_data *data =dev_get_drvdata (dev); +struct i2c_client *client = data->client;unsigned long val;if (kstrtoul (buf,10 , &val) <0 )
@@ -410,7 +409,7 @@ static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_alarm, NULL, static DEVICE_ATTR(update_interval, S_IWUSR | S_IRUGO, show_interval, set_interval); -static struct attribute *lm95245_attributes[] = { +static struct attribute *lm95245_attrs[] = { &sensor_dev_attr_temp1_input.dev_attr.attr, &sensor_dev_attr_temp1_crit.dev_attr.attr, &sensor_dev_attr_temp1_crit_hyst.dev_attr.attr,
@@ -424,10 +423,7 @@ static struct attribute *lm95245_attributes[] = { &dev_attr_update_interval.attr,NULL }; - -static const struct attribute_group lm95245_group = { - .attrs = lm95245_attributes, -}; +ATTRIBUTE_GROUPS (lm95245);/* Return 0 if detection is successful, -ENODEV otherwise */ static int lm95245_detect(struct i2c_client *new_client,
@@ -448,10 +444,9 @@ static int lm95245_detect(struct i2c_client *new_client,return 0 ; } -static void lm95245_init_client (struct i2c_client *client) +static void lm95245_init_client (struct i2c_client *client, +struct lm95245_data *data) { -struct lm95245_data *data =i2c_get_clientdata (client); - data->interval =lm95245_read_conversion_rate (client); data->config1 = i2c_smbus_read_byte_data(client,
@@ -467,49 +462,27 @@ static void lm95245_init_client(struct i2c_client *client) } } -static int lm95245_probe (struct i2c_client *new_client, +static int lm95245_probe (struct i2c_client *client,const struct i2c_device_id *id) { +struct device *dev = &client->dev;struct lm95245_data *data; -int err; +struct device *hwmon_dev; - data =devm_kzalloc (&new_client->dev,sizeof (struct lm95245_data ), -GFP_KERNEL ); + data =devm_kzalloc (dev,sizeof (struct lm95245_data ),GFP_KERNEL );if (!data)return -ENOMEM ; -i2c_set_clientdata (new_client, data); + data->client = client;mutex_init (&data->update_lock);/* Initialize the LM95245 chip */ -lm95245_init_client (new_client); - -/* Register sysfs hooks */ - err =sysfs_create_group (&new_client->dev.kobj, &lm95245_group); -if (err) -return err; - - data->hwmon_dev =hwmon_device_register (&new_client->dev); -if (IS_ERR (data->hwmon_dev)) { - err =PTR_ERR (data->hwmon_dev); - goto exit_remove_files; - } +lm95245_init_client (client, data); -return 0 ; - -exit_remove_files: -sysfs_remove_group (&new_client->dev.kobj, &lm95245_group); -return err; -} - -static int lm95245_remove (struct i2c_client *client) -{ -struct lm95245_data *data =i2c_get_clientdata (client); - -hwmon_device_unregister (data->hwmon_dev); -sysfs_remove_group (&client->dev.kobj, &lm95245_group); - -return 0 ; + hwmon_dev =devm_hwmon_device_register_with_groups (dev, client->name, + data, + lm95245_groups); +return PTR_ERR_OR_ZERO (hwmon_dev); }/* Driver data (common to all clients) */
@@ -525,7 +498,6 @@ static struct i2c_driver lm95245_driver = { .name = DEVNAME, }, .probe = lm95245_probe, - .remove = lm95245_remove, .id_table = lm95245_id, .detect = lm95245_detect, .address_list = normal_i2c,
Signature · 7 lines
1.7.9.7 _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Re: [lm-sensors] [PATCH v2 2/4] hwmon: (lm95245) Convert to use devm_hwmon_device_register_with_grou
Quoted 16 lines · Guenter Roeck
Simplify code, reduce code size, and attach hwmon attributes to hwmon device.
Signed-off-by Guenter Roeck <[email protected]>---
v2: Adjust to changes in 1st patchdrivers/hwmon/lm95245.c | 82 ++++++++++++++++------------------------------- 1 file changed, 27 insertions(+), 55 deletions(-)drivers/hwmon/lm95245.c +0
-0
drivers/hwmon/lm95245.c static struct lm95245_data *lm95245_update_device(struct device *dev) · line 155
Quoted 8 lines
drivers/hwmon/lm95245.c +1
-1@@ -149,7 +149,7 @@ static struct lm95245_data *lm95245_update_device(struct device *dev) + msecs_to_jiffies(data->interval)) || !data->valid) {int i; -dev_dbg (&client->dev,"Updating lm95245 data.\n" ); +dev_dbg (dev,"Updating lm95245 data.\n" );for (i =0 ; i <ARRAY_SIZE (lm95245_reg_address); i++) data->regs[i] = i2c_smbus_read_byte_data(client,
You could apply patch 3/4 first and make this patch smaller.
Other than this, it looks alright.
Signature · 7 lines
Jean Delvare Suse L3 Support _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Guenter Roeck
maintainerRe: [lm-sensors] [PATCH v2 2/4] hwmon: (lm95245) Convert to use devm_hwmon_device_register_with_grou
In reply to Guenter RoeckQuoted 20 lines · Jean Delvare
Quoted 19 lines · Guenter Roeck
Simplify code, reduce code size, and attach hwmon attributes to hwmon device.
Signed-off-by Guenter Roeck <[email protected]>---
v2: Adjust to changes in 1st patchdrivers/hwmon/lm95245.c | 82 ++++++++++++++++------------------------------- 1 file changed, 27 insertions(+), 55 deletions(-)drivers/hwmon/lm95245.c +0
-0@@ -149,7 +149,7 @@ static struct lm95245_data *lm95245_update_device(struct device *dev) + msecs_to_jiffies(data->interval)) || !data->valid) {int i;
Quoted 8 lines
drivers/hwmon/lm95245.c static struct lm95245_data *lm95245_update_device(struct device *dev) · line 155
Quoted 5 lines
drivers/hwmon/lm95245.c +1
-1-dev_dbg (&client->dev,"Updating lm95245 data.\n" ); +dev_dbg (dev,"Updating lm95245 data.\n" );for (i =0 ; i <ARRAY_SIZE (lm95245_reg_address); i++) data->regs[i] = i2c_smbus_read_byte_data(client,You could apply patch 3/4 first and make this patch smaller.
Good idea, I'll do that.
Quoted 4 lines
Other than this, it looks alright.
Reviewed-by Jean Delvare <[email protected]>
Thanks!
Guenter
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors