| Message ID | 1379457245-17810-1-git-send-email-eduardo.valentin@ti.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Tue, Sep 17, 2013 at 06:34:05PM -0400, Eduardo Valentin wrote: > This patch adds to tmp102 temperature sensor the possibility > to expose itself as thermal zone device, registered on the > thermal framework. > > The thermal zone is built only if a device tree node > describing a thermal zone for this sensor is present > inside the tmp102 DT node. Otherwise, the driver behavior > will be the same. > > Cc: Jean Delvare <khali@linux-fr.org> > Cc: Guenter Roeck <linux@roeck-us.net> > Cc: lm-sensors@lm-sensors.org > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com> > --- > drivers/hwmon/tmp102.c | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) > > --- > > Guenter, > > Here is a version without the warnings, as requested. > > Eduardo > > diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c > index d7b47ab..dc96598 100644 > --- a/drivers/hwmon/tmp102.c > +++ b/drivers/hwmon/tmp102.c > @@ -27,6 +27,8 @@ > #include <linux/mutex.h> > #include <linux/device.h> > #include <linux/jiffies.h> > +#include <linux/thermal.h> > +#include <linux/of.h> > > #define DRIVER_NAME "tmp102" > > @@ -50,6 +52,7 @@ > > struct tmp102 { > struct device *hwmon_dev; > + struct thermal_zone_device *tz; > struct mutex lock; > u16 config_orig; > unsigned long last_update; > @@ -93,6 +96,15 @@ static struct tmp102 *tmp102_update_device(struct i2c_client *client) > return tmp102; > } > > +static int tmp102_read_temp(void *dev, long *temp) > +{ > + struct tmp102 *tmp102 = tmp102_update_device(to_i2c_client(dev)); > + > + *temp = tmp102->temp[0]; > + > + return 0; > +} > + > static ssize_t tmp102_show_temp(struct device *dev, > struct device_attribute *attr, > char *buf) > @@ -204,6 +216,12 @@ static int tmp102_probe(struct i2c_client *client, > goto fail_remove_sysfs; > } > > + tmp102->tz = thermal_zone_of_sensor_register(&client->dev, 0, > + &client->dev, > + tmp102_read_temp, NULL); > + if (IS_ERR(tmp102->tz)) > + tmp102->tz = NULL; > + > dev_info(&client->dev, "initialized\n"); > > return 0; > @@ -220,6 +238,8 @@ static int tmp102_remove(struct i2c_client *client) > { > struct tmp102 *tmp102 = i2c_get_clientdata(client); > > + /* thermal zone life cycle is not our responsibility */ This comment does not provide any value. Please drop it from both drivers. Sorry I missed that earlier. > + thermal_zone_of_sensor_unregister(&client->dev, tmp102->tz); > hwmon_device_unregister(tmp102->hwmon_dev); > sysfs_remove_group(&client->dev.kobj, &tmp102_attr_group); > > -- > 1.8.2.1.342.gfa7285d > > -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 18-09-2013 07:06, Guenter Roeck wrote: > On Tue, Sep 17, 2013 at 06:34:05PM -0400, Eduardo Valentin wrote: >> This patch adds to tmp102 temperature sensor the possibility >> to expose itself as thermal zone device, registered on the >> thermal framework. >> >> The thermal zone is built only if a device tree node >> describing a thermal zone for this sensor is present >> inside the tmp102 DT node. Otherwise, the driver behavior >> will be the same. >> >> Cc: Jean Delvare <khali@linux-fr.org> >> Cc: Guenter Roeck <linux@roeck-us.net> >> Cc: lm-sensors@lm-sensors.org >> Cc: linux-kernel@vger.kernel.org >> Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com> >> --- >> drivers/hwmon/tmp102.c | 20 ++++++++++++++++++++ >> 1 file changed, 20 insertions(+) >> >> --- >> >> Guenter, >> >> Here is a version without the warnings, as requested. >> >> Eduardo >> >> diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c >> index d7b47ab..dc96598 100644 >> --- a/drivers/hwmon/tmp102.c >> +++ b/drivers/hwmon/tmp102.c >> @@ -27,6 +27,8 @@ >> #include <linux/mutex.h> >> #include <linux/device.h> >> #include <linux/jiffies.h> >> +#include <linux/thermal.h> >> +#include <linux/of.h> >> >> #define DRIVER_NAME "tmp102" >> >> @@ -50,6 +52,7 @@ >> >> struct tmp102 { >> struct device *hwmon_dev; >> + struct thermal_zone_device *tz; >> struct mutex lock; >> u16 config_orig; >> unsigned long last_update; >> @@ -93,6 +96,15 @@ static struct tmp102 *tmp102_update_device(struct i2c_client *client) >> return tmp102; >> } >> >> +static int tmp102_read_temp(void *dev, long *temp) >> +{ >> + struct tmp102 *tmp102 = tmp102_update_device(to_i2c_client(dev)); >> + >> + *temp = tmp102->temp[0]; >> + >> + return 0; >> +} >> + >> static ssize_t tmp102_show_temp(struct device *dev, >> struct device_attribute *attr, >> char *buf) >> @@ -204,6 +216,12 @@ static int tmp102_probe(struct i2c_client *client, >> goto fail_remove_sysfs; >> } >> >> + tmp102->tz = thermal_zone_of_sensor_register(&client->dev, 0, >> + &client->dev, >> + tmp102_read_temp, NULL); >> + if (IS_ERR(tmp102->tz)) >> + tmp102->tz = NULL; >> + >> dev_info(&client->dev, "initialized\n"); >> >> return 0; >> @@ -220,6 +238,8 @@ static int tmp102_remove(struct i2c_client *client) >> { >> struct tmp102 *tmp102 = i2c_get_clientdata(client); >> >> + /* thermal zone life cycle is not our responsibility */ > > This comment does not provide any value. Please drop it from both drivers. > Sorry I missed that earlier. Yeah, I even forgot to drop it myself. No problem, I am resending both without it. > >> + thermal_zone_of_sensor_unregister(&client->dev, tmp102->tz); >> hwmon_device_unregister(tmp102->hwmon_dev); >> sysfs_remove_group(&client->dev.kobj, &tmp102_attr_group); >> >> -- >> 1.8.2.1.342.gfa7285d >> >> > >
diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c index d7b47ab..dc96598 100644 --- a/drivers/hwmon/tmp102.c +++ b/drivers/hwmon/tmp102.c @@ -27,6 +27,8 @@ #include <linux/mutex.h> #include <linux/device.h> #include <linux/jiffies.h> +#include <linux/thermal.h> +#include <linux/of.h> #define DRIVER_NAME "tmp102" @@ -50,6 +52,7 @@ struct tmp102 { struct device *hwmon_dev; + struct thermal_zone_device *tz; struct mutex lock; u16 config_orig; unsigned long last_update; @@ -93,6 +96,15 @@ static struct tmp102 *tmp102_update_device(struct i2c_client *client) return tmp102; } +static int tmp102_read_temp(void *dev, long *temp) +{ + struct tmp102 *tmp102 = tmp102_update_device(to_i2c_client(dev)); + + *temp = tmp102->temp[0]; + + return 0; +} + static ssize_t tmp102_show_temp(struct device *dev, struct device_attribute *attr, char *buf) @@ -204,6 +216,12 @@ static int tmp102_probe(struct i2c_client *client, goto fail_remove_sysfs; } + tmp102->tz = thermal_zone_of_sensor_register(&client->dev, 0, + &client->dev, + tmp102_read_temp, NULL); + if (IS_ERR(tmp102->tz)) + tmp102->tz = NULL; + dev_info(&client->dev, "initialized\n"); return 0; @@ -220,6 +238,8 @@ static int tmp102_remove(struct i2c_client *client) { struct tmp102 *tmp102 = i2c_get_clientdata(client); + /* thermal zone life cycle is not our responsibility */ + thermal_zone_of_sensor_unregister(&client->dev, tmp102->tz); hwmon_device_unregister(tmp102->hwmon_dev); sysfs_remove_group(&client->dev.kobj, &tmp102_attr_group);
This patch adds to tmp102 temperature sensor the possibility to expose itself as thermal zone device, registered on the thermal framework. The thermal zone is built only if a device tree node describing a thermal zone for this sensor is present inside the tmp102 DT node. Otherwise, the driver behavior will be the same. Cc: Jean Delvare <khali@linux-fr.org> Cc: Guenter Roeck <linux@roeck-us.net> Cc: lm-sensors@lm-sensors.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com> --- drivers/hwmon/tmp102.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) --- Guenter, Here is a version without the warnings, as requested. Eduardo