Messages in this thread | | | Subject | Re: [PATCH 02/13] hwmon: convert ntc_thermistor to use devm_thermal_zone_of_sensor_register | From | Guenter Roeck <> | Date | Wed, 9 Mar 2016 19:19:39 -0800 |
| |
On 03/09/2016 01:35 PM, Eduardo Valentin wrote: > This changes the driver to use the devm_ version > of thermal_zone_of_sensor_register and cleans > up the local points and unregister calls. > > Cc: Jean Delvare <jdelvare@suse.com> > Cc: Guenter Roeck <linux@roeck-us.net> > Cc: lm-sensors@lm-sensors.org > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
> --- > drivers/hwmon/ntc_thermistor.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/hwmon/ntc_thermistor.c b/drivers/hwmon/ntc_thermistor.c > index feed306..ffc12f1 100644 > --- a/drivers/hwmon/ntc_thermistor.c > +++ b/drivers/hwmon/ntc_thermistor.c > @@ -221,7 +221,6 @@ struct ntc_data { > struct device *dev; > int n_comp; > char name[PLATFORM_NAME_SIZE]; > - struct thermal_zone_device *tz; > }; > > #if defined(CONFIG_OF) && IS_ENABLED(CONFIG_IIO) > @@ -539,6 +538,7 @@ static const struct thermal_zone_of_device_ops ntc_of_thermal_ops = { > > static int ntc_thermistor_probe(struct platform_device *pdev) > { > + struct thermal_zone_device *tz; > const struct of_device_id *of_id = > of_match_device(of_match_ptr(ntc_match), &pdev->dev); > const struct platform_device_id *pdev_id; > @@ -633,12 +633,10 @@ static int ntc_thermistor_probe(struct platform_device *pdev) > dev_info(&pdev->dev, "Thermistor type: %s successfully probed.\n", > pdev_id->name); > > - data->tz = thermal_zone_of_sensor_register(data->dev, 0, data->dev, > - &ntc_of_thermal_ops); > - if (IS_ERR(data->tz)) { > + tz = devm_thermal_zone_of_sensor_register(data->dev, 0, data->dev, > + &ntc_of_thermal_ops); > + if (IS_ERR(tz)) > dev_dbg(&pdev->dev, "Failed to register to thermal fw.\n"); > - data->tz = NULL; > - } > > return 0; > err_after_sysfs: > @@ -656,8 +654,6 @@ static int ntc_thermistor_remove(struct platform_device *pdev) > sysfs_remove_group(&data->dev->kobj, &ntc_attr_group); > ntc_iio_channel_release(pdata); > > - thermal_zone_of_sensor_unregister(data->dev, data->tz); > - > return 0; > } > >
| |