* [PATCH 3/5] drivers: thermal: make usage of CONFIG_THERMAL_HWMON optional [not found] <1377295396-17289-1-git-send-email-eduardo.valentin@ti.com> @ 2013-08-23 22:03 ` Eduardo Valentin 2013-08-23 23:08 ` Rafael J. Wysocki 0 siblings, 1 reply; 8+ messages in thread From: Eduardo Valentin @ 2013-08-23 22:03 UTC (permalink / raw) To: linux-arm-kernel When registering a new thermal_device, the thermal framework will always add a hwmon sysfs interface. This patch adds a flag to make this behavior optional. Now when registering a new thermal device, the caller needs to say if the hwmon interface is required. In order to keep same behavior as of today, all current calls will by default create the hwmon interface. Cc: Anton Vorontsov <anton@enomsg.org> Cc: David Woodhouse <dwmw2@infradead.org> Cc: devicetree at vger.kernel.org Cc: Grant Likely <grant.likely@linaro.org> Cc: Kukjin Kim <kgene.kim@samsung.com> Cc: Len Brown <lenb@kernel.org> Cc: linux-acpi at vger.kernel.org Cc: linux-arm-kernel at lists.infradead.org Cc: linux-kernel at vger.kernel.org Cc: linux-pm at vger.kernel.org Cc: linux-samsung-soc at vger.kernel.org Cc: Matthew Garrett <matthew.garrett@nebula.com> Cc: Peter Feuerer <peter@piie.net> Cc: platform-driver-x86 at vger.kernel.org Cc: "Rafael J. Wysocki" <rjw@sisk.pl> Cc: Rob Herring <rob.herring@calxeda.com> Cc: Zhang Rui <rui.zhang@intel.com> Suggested-by: Wei Ni <wni@nvidia.com> Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com> --- Documentation/thermal/sysfs-api.txt | 4 +++- drivers/acpi/thermal.c | 6 ++++-- drivers/platform/x86/acerhdf.c | 3 ++- drivers/platform/x86/intel_mid_thermal.c | 2 +- drivers/power/power_supply_core.c | 2 +- drivers/thermal/armada_thermal.c | 2 +- drivers/thermal/db8500_thermal.c | 2 +- drivers/thermal/dove_thermal.c | 2 +- drivers/thermal/exynos_thermal.c | 2 +- drivers/thermal/kirkwood_thermal.c | 2 +- drivers/thermal/rcar_thermal.c | 2 +- drivers/thermal/spear_thermal.c | 2 +- drivers/thermal/thermal_core.c | 13 +++++++++---- drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 2 +- drivers/thermal/x86_pkg_temp_thermal.c | 2 +- include/linux/thermal.h | 2 +- 16 files changed, 30 insertions(+), 20 deletions(-) diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt index a71bd5b..4b4a052 100644 --- a/Documentation/thermal/sysfs-api.txt +++ b/Documentation/thermal/sysfs-api.txt @@ -64,7 +64,9 @@ temperature) and throttle appropriate devices. performing passive cooling. polling_delay: number of milliseconds to wait between polls when checking whether trip points have been crossed (0 for interrupt driven systems). - + add_hwmon: a boolean to indicate if the thermal to hwmon sysfs interface + is required. When add_hwmon == true, a hwmon sysfs interface + will be created. When add_hwmon == false, nothing will be done 1.1.2 void thermal_zone_device_unregister(struct thermal_zone_device *tz) diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index a33821c..4d542b4 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -916,12 +916,14 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) thermal_zone_device_register("acpitz", trips, 0, tz, &acpi_thermal_zone_ops, NULL, tz->trips.passive.tsp*100, - tz->polling_frequency*100); + tz->polling_frequency*100, + true); else tz->thermal_zone = thermal_zone_device_register("acpitz", trips, 0, tz, &acpi_thermal_zone_ops, NULL, - 0, tz->polling_frequency*100); + 0, tz->polling_frequency*100, + true); if (IS_ERR(tz->thermal_zone)) return -ENODEV; diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c index f94467c..004d9ba0 100644 --- a/drivers/platform/x86/acerhdf.c +++ b/drivers/platform/x86/acerhdf.c @@ -663,7 +663,8 @@ static int acerhdf_register_thermal(void) thz_dev = thermal_zone_device_register("acerhdf", 1, 0, NULL, &acerhdf_dev_ops, NULL, 0, - (kernelmode) ? interval*1000 : 0); + (kernelmode) ? interval*1000 : 0, + true); if (IS_ERR(thz_dev)) return -EINVAL; diff --git a/drivers/platform/x86/intel_mid_thermal.c b/drivers/platform/x86/intel_mid_thermal.c index 81c491e..efea0bf 100644 --- a/drivers/platform/x86/intel_mid_thermal.c +++ b/drivers/platform/x86/intel_mid_thermal.c @@ -502,7 +502,7 @@ static int mid_thermal_probe(struct platform_device *pdev) goto err; } pinfo->tzd[i] = thermal_zone_device_register(name[i], - 0, 0, td_info, &tzd_ops, NULL, 0, 0); + 0, 0, td_info, &tzd_ops, NULL, 0, 0, true); if (IS_ERR(pinfo->tzd[i])) { kfree(td_info); ret = PTR_ERR(pinfo->tzd[i]); diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c index 3b2d5df..5f39914 100644 --- a/drivers/power/power_supply_core.c +++ b/drivers/power/power_supply_core.c @@ -359,7 +359,7 @@ static int psy_register_thermal(struct power_supply *psy) for (i = 0; i < psy->num_properties; i++) { if (psy->properties[i] == POWER_SUPPLY_PROP_TEMP) { psy->tzd = thermal_zone_device_register(psy->name, 0, 0, - psy, &psy_tzd_ops, NULL, 0, 0); + psy, &psy_tzd_ops, NULL, 0, 0, true); if (IS_ERR(psy->tzd)) return PTR_ERR(psy->tzd); break; diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c index 5e53212..bc54c80 100644 --- a/drivers/thermal/armada_thermal.c +++ b/drivers/thermal/armada_thermal.c @@ -182,7 +182,7 @@ static int armada_thermal_probe(struct platform_device *pdev) priv->ops->init_sensor(priv); thermal = thermal_zone_device_register("armada_thermal", 0, 0, - priv, &ops, NULL, 0, 0); + priv, &ops, NULL, 0, 0, true); if (IS_ERR(thermal)) { dev_err(&pdev->dev, "Failed to register thermal zone device\n"); diff --git a/drivers/thermal/db8500_thermal.c b/drivers/thermal/db8500_thermal.c index 1e3b3bf..439a854 100644 --- a/drivers/thermal/db8500_thermal.c +++ b/drivers/thermal/db8500_thermal.c @@ -447,7 +447,7 @@ static int db8500_thermal_probe(struct platform_device *pdev) } pzone->therm_dev = thermal_zone_device_register("db8500_thermal_zone", - ptrips->num_trips, 0, pzone, &thdev_ops, NULL, 0, 0); + ptrips->num_trips, 0, pzone, &thdev_ops, NULL, 0, 0, true); if (IS_ERR(pzone->therm_dev)) { dev_err(&pdev->dev, "Register thermal zone device failed.\n"); diff --git a/drivers/thermal/dove_thermal.c b/drivers/thermal/dove_thermal.c index 828f5e3..61f2247 100644 --- a/drivers/thermal/dove_thermal.c +++ b/drivers/thermal/dove_thermal.c @@ -155,7 +155,7 @@ static int dove_thermal_probe(struct platform_device *pdev) } thermal = thermal_zone_device_register("dove_thermal", 0, 0, - priv, &ops, NULL, 0, 0); + priv, &ops, NULL, 0, 0, true); if (IS_ERR(thermal)) { dev_err(&pdev->dev, "Failed to register thermal zone device\n"); diff --git a/drivers/thermal/exynos_thermal.c b/drivers/thermal/exynos_thermal.c index 9af4b93..6ffadd3 100644 --- a/drivers/thermal/exynos_thermal.c +++ b/drivers/thermal/exynos_thermal.c @@ -469,7 +469,7 @@ static int exynos_register_thermal(struct thermal_sensor_conf *sensor_conf) th_zone->therm_dev = thermal_zone_device_register(sensor_conf->name, EXYNOS_ZONE_COUNT, 0, NULL, &exynos_dev_ops, NULL, 0, sensor_conf->trip_data.trigger_falling ? - 0 : IDLE_INTERVAL); + 0 : IDLE_INTERVAL, true); if (IS_ERR(th_zone->therm_dev)) { pr_err("Failed to register thermal zone device\n"); diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c index 3b034a0..fb8853e 100644 --- a/drivers/thermal/kirkwood_thermal.c +++ b/drivers/thermal/kirkwood_thermal.c @@ -85,7 +85,7 @@ static int kirkwood_thermal_probe(struct platform_device *pdev) return PTR_ERR(priv->sensor); thermal = thermal_zone_device_register("kirkwood_thermal", 0, 0, - priv, &ops, NULL, 0, 0); + priv, &ops, NULL, 0, 0, true); if (IS_ERR(thermal)) { dev_err(&pdev->dev, "Failed to register thermal zone device\n"); diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c index 88f92e1..64ae530 100644 --- a/drivers/thermal/rcar_thermal.c +++ b/drivers/thermal/rcar_thermal.c @@ -439,7 +439,7 @@ static int rcar_thermal_probe(struct platform_device *pdev) priv->zone = thermal_zone_device_register("rcar_thermal", 1, 0, priv, &rcar_thermal_zone_ops, NULL, 0, - idle); + idle, true); if (IS_ERR(priv->zone)) { dev_err(dev, "can't register thermal zone\n"); ret = PTR_ERR(priv->zone); diff --git a/drivers/thermal/spear_thermal.c b/drivers/thermal/spear_thermal.c index ab79ea4..ec0c44d 100644 --- a/drivers/thermal/spear_thermal.c +++ b/drivers/thermal/spear_thermal.c @@ -140,7 +140,7 @@ static int spear_thermal_probe(struct platform_device *pdev) writel_relaxed(stdev->flags, stdev->thermal_base); spear_thermal = thermal_zone_device_register("spear_thermal", 0, 0, - stdev, &ops, NULL, 0, 0); + stdev, &ops, NULL, 0, 0, true); if (IS_ERR(spear_thermal)) { dev_err(&pdev->dev, "thermal zone device is NULL\n"); ret = PTR_ERR(spear_thermal); diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 247528b..d949ab0 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -1344,6 +1344,9 @@ static void remove_trip_attrs(struct thermal_zone_device *tz) * @polling_delay: number of milliseconds to wait between polls when checking * whether trip points have been crossed (0 for interrupt * driven systems) + * @add_hwmon: a boolean to indicate if the thermal to hwmon sysfs interface + * is required. When add_hwmon == true, a hwmon sysfs interface + * will be created. When add_hwmon == false, nothing will be done * * This interface function adds a new thermal zone device (sensor) to * /sys/class/thermal folder as thermal_zone[0-*]. It tries to bind all the @@ -1359,7 +1362,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, int trips, int mask, void *devdata, const struct thermal_zone_device_ops *ops, const struct thermal_zone_params *tzp, - int passive_delay, int polling_delay) + int passive_delay, int polling_delay, bool add_hwmon) { struct thermal_zone_device *tz; enum thermal_trip_type trip_type; @@ -1462,9 +1465,11 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, mutex_unlock(&thermal_governor_lock); - result = thermal_add_hwmon_sysfs(tz); - if (result) - goto unregister; + if (add_hwmon) { + result = thermal_add_hwmon_sysfs(tz); + if (result) + goto unregister; + } mutex_lock(&thermal_list_lock); list_add_tail(&tz->node, &thermal_tz_list); diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c index 4c5f55c37..5ab613a 100644 --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c @@ -306,7 +306,7 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id, data->ti_thermal = thermal_zone_device_register(domain, OMAP_TRIP_NUMBER, 0, data, &ti_thermal_ops, NULL, FAST_TEMP_MONITORING_RATE, - FAST_TEMP_MONITORING_RATE); + FAST_TEMP_MONITORING_RATE, true); if (IS_ERR(data->ti_thermal)) { dev_err(bgp->dev, "thermal zone device is NULL\n"); return PTR_ERR(data->ti_thermal); diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c index f36950e..74eb4c0 100644 --- a/drivers/thermal/x86_pkg_temp_thermal.c +++ b/drivers/thermal/x86_pkg_temp_thermal.c @@ -444,7 +444,7 @@ static int pkg_temp_thermal_device_add(unsigned int cpu) thres_count, (thres_count == MAX_NUMBER_OF_TRIPS) ? 0x03 : 0x01, - phy_dev_entry, &tzone_ops, NULL, 0, 0); + phy_dev_entry, &tzone_ops, NULL, 0, 0, true); if (IS_ERR(phy_dev_entry->tzone)) { err = PTR_ERR(phy_dev_entry->tzone); goto err_ret_free; diff --git a/include/linux/thermal.h b/include/linux/thermal.h index a386a1c..88148b9 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -226,7 +226,7 @@ struct thermal_genl_event { /* Function declarations */ struct thermal_zone_device *thermal_zone_device_register(const char *, int, int, void *, const struct thermal_zone_device_ops *, - const struct thermal_zone_params *, int, int); + const struct thermal_zone_params *, int, int, bool); void thermal_zone_device_unregister(struct thermal_zone_device *); int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int, -- 1.8.2.1.342.gfa7285d ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/5] drivers: thermal: make usage of CONFIG_THERMAL_HWMON optional 2013-08-23 22:03 ` [PATCH 3/5] drivers: thermal: make usage of CONFIG_THERMAL_HWMON optional Eduardo Valentin @ 2013-08-23 23:08 ` Rafael J. Wysocki 2013-08-27 18:26 ` Eduardo Valentin 0 siblings, 1 reply; 8+ messages in thread From: Rafael J. Wysocki @ 2013-08-23 23:08 UTC (permalink / raw) To: linux-arm-kernel On Friday, August 23, 2013 06:03:14 PM Eduardo Valentin wrote: > When registering a new thermal_device, the thermal framework > will always add a hwmon sysfs interface. > > This patch adds a flag to make this behavior optional. Now > when registering a new thermal device, the caller needs > to say if the hwmon interface is required. > > In order to keep same behavior as of today, all current > calls will by default create the hwmon interface. Well, instead of modifying all of the callers this way, why don't you add new versions taking the additional argument as, for example, thermal_zone_device_register_full() and redefine the old ones as static inline wrappers, for example static inline struct thermal_zone_device *thermal_zone_device_register(args) { return thermal_zone_device_register_full(args, true); } ? That'd reduce the size of this patch a bit I suppose (and the number of subsystems involved at the same time). Thanks, Rafael > Cc: Anton Vorontsov <anton@enomsg.org> > Cc: David Woodhouse <dwmw2@infradead.org> > Cc: devicetree at vger.kernel.org > Cc: Grant Likely <grant.likely@linaro.org> > Cc: Kukjin Kim <kgene.kim@samsung.com> > Cc: Len Brown <lenb@kernel.org> > Cc: linux-acpi at vger.kernel.org > Cc: linux-arm-kernel at lists.infradead.org > Cc: linux-kernel at vger.kernel.org > Cc: linux-pm at vger.kernel.org > Cc: linux-samsung-soc at vger.kernel.org > Cc: Matthew Garrett <matthew.garrett@nebula.com> > Cc: Peter Feuerer <peter@piie.net> > Cc: platform-driver-x86 at vger.kernel.org > Cc: "Rafael J. Wysocki" <rjw@sisk.pl> > Cc: Rob Herring <rob.herring@calxeda.com> > Cc: Zhang Rui <rui.zhang@intel.com> > Suggested-by: Wei Ni <wni@nvidia.com> > Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com> > --- > Documentation/thermal/sysfs-api.txt | 4 +++- > drivers/acpi/thermal.c | 6 ++++-- > drivers/platform/x86/acerhdf.c | 3 ++- > drivers/platform/x86/intel_mid_thermal.c | 2 +- > drivers/power/power_supply_core.c | 2 +- > drivers/thermal/armada_thermal.c | 2 +- > drivers/thermal/db8500_thermal.c | 2 +- > drivers/thermal/dove_thermal.c | 2 +- > drivers/thermal/exynos_thermal.c | 2 +- > drivers/thermal/kirkwood_thermal.c | 2 +- > drivers/thermal/rcar_thermal.c | 2 +- > drivers/thermal/spear_thermal.c | 2 +- > drivers/thermal/thermal_core.c | 13 +++++++++---- > drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 2 +- > drivers/thermal/x86_pkg_temp_thermal.c | 2 +- > include/linux/thermal.h | 2 +- > 16 files changed, 30 insertions(+), 20 deletions(-) > > diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt > index a71bd5b..4b4a052 100644 > --- a/Documentation/thermal/sysfs-api.txt > +++ b/Documentation/thermal/sysfs-api.txt > @@ -64,7 +64,9 @@ temperature) and throttle appropriate devices. > performing passive cooling. > polling_delay: number of milliseconds to wait between polls when checking > whether trip points have been crossed (0 for interrupt driven systems). > - > + add_hwmon: a boolean to indicate if the thermal to hwmon sysfs interface > + is required. When add_hwmon == true, a hwmon sysfs interface > + will be created. When add_hwmon == false, nothing will be done > > 1.1.2 void thermal_zone_device_unregister(struct thermal_zone_device *tz) > > diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c > index a33821c..4d542b4 100644 > --- a/drivers/acpi/thermal.c > +++ b/drivers/acpi/thermal.c > @@ -916,12 +916,14 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) > thermal_zone_device_register("acpitz", trips, 0, tz, > &acpi_thermal_zone_ops, NULL, > tz->trips.passive.tsp*100, > - tz->polling_frequency*100); > + tz->polling_frequency*100, > + true); > else > tz->thermal_zone = > thermal_zone_device_register("acpitz", trips, 0, tz, > &acpi_thermal_zone_ops, NULL, > - 0, tz->polling_frequency*100); > + 0, tz->polling_frequency*100, > + true); > if (IS_ERR(tz->thermal_zone)) > return -ENODEV; > > diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c > index f94467c..004d9ba0 100644 > --- a/drivers/platform/x86/acerhdf.c > +++ b/drivers/platform/x86/acerhdf.c > @@ -663,7 +663,8 @@ static int acerhdf_register_thermal(void) > > thz_dev = thermal_zone_device_register("acerhdf", 1, 0, NULL, > &acerhdf_dev_ops, NULL, 0, > - (kernelmode) ? interval*1000 : 0); > + (kernelmode) ? interval*1000 : 0, > + true); > if (IS_ERR(thz_dev)) > return -EINVAL; > > diff --git a/drivers/platform/x86/intel_mid_thermal.c b/drivers/platform/x86/intel_mid_thermal.c > index 81c491e..efea0bf 100644 > --- a/drivers/platform/x86/intel_mid_thermal.c > +++ b/drivers/platform/x86/intel_mid_thermal.c > @@ -502,7 +502,7 @@ static int mid_thermal_probe(struct platform_device *pdev) > goto err; > } > pinfo->tzd[i] = thermal_zone_device_register(name[i], > - 0, 0, td_info, &tzd_ops, NULL, 0, 0); > + 0, 0, td_info, &tzd_ops, NULL, 0, 0, true); > if (IS_ERR(pinfo->tzd[i])) { > kfree(td_info); > ret = PTR_ERR(pinfo->tzd[i]); > diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c > index 3b2d5df..5f39914 100644 > --- a/drivers/power/power_supply_core.c > +++ b/drivers/power/power_supply_core.c > @@ -359,7 +359,7 @@ static int psy_register_thermal(struct power_supply *psy) > for (i = 0; i < psy->num_properties; i++) { > if (psy->properties[i] == POWER_SUPPLY_PROP_TEMP) { > psy->tzd = thermal_zone_device_register(psy->name, 0, 0, > - psy, &psy_tzd_ops, NULL, 0, 0); > + psy, &psy_tzd_ops, NULL, 0, 0, true); > if (IS_ERR(psy->tzd)) > return PTR_ERR(psy->tzd); > break; > diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c > index 5e53212..bc54c80 100644 > --- a/drivers/thermal/armada_thermal.c > +++ b/drivers/thermal/armada_thermal.c > @@ -182,7 +182,7 @@ static int armada_thermal_probe(struct platform_device *pdev) > priv->ops->init_sensor(priv); > > thermal = thermal_zone_device_register("armada_thermal", 0, 0, > - priv, &ops, NULL, 0, 0); > + priv, &ops, NULL, 0, 0, true); > if (IS_ERR(thermal)) { > dev_err(&pdev->dev, > "Failed to register thermal zone device\n"); > diff --git a/drivers/thermal/db8500_thermal.c b/drivers/thermal/db8500_thermal.c > index 1e3b3bf..439a854 100644 > --- a/drivers/thermal/db8500_thermal.c > +++ b/drivers/thermal/db8500_thermal.c > @@ -447,7 +447,7 @@ static int db8500_thermal_probe(struct platform_device *pdev) > } > > pzone->therm_dev = thermal_zone_device_register("db8500_thermal_zone", > - ptrips->num_trips, 0, pzone, &thdev_ops, NULL, 0, 0); > + ptrips->num_trips, 0, pzone, &thdev_ops, NULL, 0, 0, true); > > if (IS_ERR(pzone->therm_dev)) { > dev_err(&pdev->dev, "Register thermal zone device failed.\n"); > diff --git a/drivers/thermal/dove_thermal.c b/drivers/thermal/dove_thermal.c > index 828f5e3..61f2247 100644 > --- a/drivers/thermal/dove_thermal.c > +++ b/drivers/thermal/dove_thermal.c > @@ -155,7 +155,7 @@ static int dove_thermal_probe(struct platform_device *pdev) > } > > thermal = thermal_zone_device_register("dove_thermal", 0, 0, > - priv, &ops, NULL, 0, 0); > + priv, &ops, NULL, 0, 0, true); > if (IS_ERR(thermal)) { > dev_err(&pdev->dev, > "Failed to register thermal zone device\n"); > diff --git a/drivers/thermal/exynos_thermal.c b/drivers/thermal/exynos_thermal.c > index 9af4b93..6ffadd3 100644 > --- a/drivers/thermal/exynos_thermal.c > +++ b/drivers/thermal/exynos_thermal.c > @@ -469,7 +469,7 @@ static int exynos_register_thermal(struct thermal_sensor_conf *sensor_conf) > th_zone->therm_dev = thermal_zone_device_register(sensor_conf->name, > EXYNOS_ZONE_COUNT, 0, NULL, &exynos_dev_ops, NULL, 0, > sensor_conf->trip_data.trigger_falling ? > - 0 : IDLE_INTERVAL); > + 0 : IDLE_INTERVAL, true); > > if (IS_ERR(th_zone->therm_dev)) { > pr_err("Failed to register thermal zone device\n"); > diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c > index 3b034a0..fb8853e 100644 > --- a/drivers/thermal/kirkwood_thermal.c > +++ b/drivers/thermal/kirkwood_thermal.c > @@ -85,7 +85,7 @@ static int kirkwood_thermal_probe(struct platform_device *pdev) > return PTR_ERR(priv->sensor); > > thermal = thermal_zone_device_register("kirkwood_thermal", 0, 0, > - priv, &ops, NULL, 0, 0); > + priv, &ops, NULL, 0, 0, true); > if (IS_ERR(thermal)) { > dev_err(&pdev->dev, > "Failed to register thermal zone device\n"); > diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c > index 88f92e1..64ae530 100644 > --- a/drivers/thermal/rcar_thermal.c > +++ b/drivers/thermal/rcar_thermal.c > @@ -439,7 +439,7 @@ static int rcar_thermal_probe(struct platform_device *pdev) > priv->zone = thermal_zone_device_register("rcar_thermal", > 1, 0, priv, > &rcar_thermal_zone_ops, NULL, 0, > - idle); > + idle, true); > if (IS_ERR(priv->zone)) { > dev_err(dev, "can't register thermal zone\n"); > ret = PTR_ERR(priv->zone); > diff --git a/drivers/thermal/spear_thermal.c b/drivers/thermal/spear_thermal.c > index ab79ea4..ec0c44d 100644 > --- a/drivers/thermal/spear_thermal.c > +++ b/drivers/thermal/spear_thermal.c > @@ -140,7 +140,7 @@ static int spear_thermal_probe(struct platform_device *pdev) > writel_relaxed(stdev->flags, stdev->thermal_base); > > spear_thermal = thermal_zone_device_register("spear_thermal", 0, 0, > - stdev, &ops, NULL, 0, 0); > + stdev, &ops, NULL, 0, 0, true); > if (IS_ERR(spear_thermal)) { > dev_err(&pdev->dev, "thermal zone device is NULL\n"); > ret = PTR_ERR(spear_thermal); > diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c > index 247528b..d949ab0 100644 > --- a/drivers/thermal/thermal_core.c > +++ b/drivers/thermal/thermal_core.c > @@ -1344,6 +1344,9 @@ static void remove_trip_attrs(struct thermal_zone_device *tz) > * @polling_delay: number of milliseconds to wait between polls when checking > * whether trip points have been crossed (0 for interrupt > * driven systems) > + * @add_hwmon: a boolean to indicate if the thermal to hwmon sysfs interface > + * is required. When add_hwmon == true, a hwmon sysfs interface > + * will be created. When add_hwmon == false, nothing will be done > * > * This interface function adds a new thermal zone device (sensor) to > * /sys/class/thermal folder as thermal_zone[0-*]. It tries to bind all the > @@ -1359,7 +1362,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, > int trips, int mask, void *devdata, > const struct thermal_zone_device_ops *ops, > const struct thermal_zone_params *tzp, > - int passive_delay, int polling_delay) > + int passive_delay, int polling_delay, bool add_hwmon) > { > struct thermal_zone_device *tz; > enum thermal_trip_type trip_type; > @@ -1462,9 +1465,11 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, > > mutex_unlock(&thermal_governor_lock); > > - result = thermal_add_hwmon_sysfs(tz); > - if (result) > - goto unregister; > + if (add_hwmon) { > + result = thermal_add_hwmon_sysfs(tz); > + if (result) > + goto unregister; > + } > > mutex_lock(&thermal_list_lock); > list_add_tail(&tz->node, &thermal_tz_list); > diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c > index 4c5f55c37..5ab613a 100644 > --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c > +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c > @@ -306,7 +306,7 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id, > data->ti_thermal = thermal_zone_device_register(domain, > OMAP_TRIP_NUMBER, 0, data, &ti_thermal_ops, > NULL, FAST_TEMP_MONITORING_RATE, > - FAST_TEMP_MONITORING_RATE); > + FAST_TEMP_MONITORING_RATE, true); > if (IS_ERR(data->ti_thermal)) { > dev_err(bgp->dev, "thermal zone device is NULL\n"); > return PTR_ERR(data->ti_thermal); > diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c > index f36950e..74eb4c0 100644 > --- a/drivers/thermal/x86_pkg_temp_thermal.c > +++ b/drivers/thermal/x86_pkg_temp_thermal.c > @@ -444,7 +444,7 @@ static int pkg_temp_thermal_device_add(unsigned int cpu) > thres_count, > (thres_count == MAX_NUMBER_OF_TRIPS) ? > 0x03 : 0x01, > - phy_dev_entry, &tzone_ops, NULL, 0, 0); > + phy_dev_entry, &tzone_ops, NULL, 0, 0, true); > if (IS_ERR(phy_dev_entry->tzone)) { > err = PTR_ERR(phy_dev_entry->tzone); > goto err_ret_free; > diff --git a/include/linux/thermal.h b/include/linux/thermal.h > index a386a1c..88148b9 100644 > --- a/include/linux/thermal.h > +++ b/include/linux/thermal.h > @@ -226,7 +226,7 @@ struct thermal_genl_event { > /* Function declarations */ > struct thermal_zone_device *thermal_zone_device_register(const char *, int, int, > void *, const struct thermal_zone_device_ops *, > - const struct thermal_zone_params *, int, int); > + const struct thermal_zone_params *, int, int, bool); > void thermal_zone_device_unregister(struct thermal_zone_device *); > > int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int, > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/5] drivers: thermal: make usage of CONFIG_THERMAL_HWMON optional 2013-08-23 23:08 ` Rafael J. Wysocki @ 2013-08-27 18:26 ` Eduardo Valentin 2013-08-27 21:17 ` Rafael J. Wysocki 0 siblings, 1 reply; 8+ messages in thread From: Eduardo Valentin @ 2013-08-27 18:26 UTC (permalink / raw) To: linux-arm-kernel On 23-08-2013 19:08, Rafael J. Wysocki wrote: > On Friday, August 23, 2013 06:03:14 PM Eduardo Valentin wrote: >> When registering a new thermal_device, the thermal framework >> will always add a hwmon sysfs interface. >> >> This patch adds a flag to make this behavior optional. Now >> when registering a new thermal device, the caller needs >> to say if the hwmon interface is required. >> >> In order to keep same behavior as of today, all current >> calls will by default create the hwmon interface. > > Well, instead of modifying all of the callers this way, why don't > you add new versions taking the additional argument as, for example, > > thermal_zone_device_register_full() > > and redefine the old ones as static inline wrappers, for example > > static inline struct thermal_zone_device *thermal_zone_device_register(args) > { > return thermal_zone_device_register_full(args, true); > } > > ? Yeah, that is another way to go and I thought of doing it like that. I just could not come out with a good API naming: thermal_zone_device_register_full(all args) thermal_zone_device_register(args) /* on hwmon == true */ thermal_zone_device_register_no_hwmon(args) /* on hwmon == false */ Would this sound reasonable naming? > > That'd reduce the size of this patch a bit I suppose (and the number of > subsystems involved at the same time). I see your point. > > Thanks, > Rafael > > >> Cc: Anton Vorontsov <anton@enomsg.org> >> Cc: David Woodhouse <dwmw2@infradead.org> >> Cc: devicetree at vger.kernel.org >> Cc: Grant Likely <grant.likely@linaro.org> >> Cc: Kukjin Kim <kgene.kim@samsung.com> >> Cc: Len Brown <lenb@kernel.org> >> Cc: linux-acpi at vger.kernel.org >> Cc: linux-arm-kernel at lists.infradead.org >> Cc: linux-kernel at vger.kernel.org >> Cc: linux-pm at vger.kernel.org >> Cc: linux-samsung-soc at vger.kernel.org >> Cc: Matthew Garrett <matthew.garrett@nebula.com> >> Cc: Peter Feuerer <peter@piie.net> >> Cc: platform-driver-x86 at vger.kernel.org >> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> >> Cc: Rob Herring <rob.herring@calxeda.com> >> Cc: Zhang Rui <rui.zhang@intel.com> >> Suggested-by: Wei Ni <wni@nvidia.com> >> Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com> >> --- >> Documentation/thermal/sysfs-api.txt | 4 +++- >> drivers/acpi/thermal.c | 6 ++++-- >> drivers/platform/x86/acerhdf.c | 3 ++- >> drivers/platform/x86/intel_mid_thermal.c | 2 +- >> drivers/power/power_supply_core.c | 2 +- >> drivers/thermal/armada_thermal.c | 2 +- >> drivers/thermal/db8500_thermal.c | 2 +- >> drivers/thermal/dove_thermal.c | 2 +- >> drivers/thermal/exynos_thermal.c | 2 +- >> drivers/thermal/kirkwood_thermal.c | 2 +- >> drivers/thermal/rcar_thermal.c | 2 +- >> drivers/thermal/spear_thermal.c | 2 +- >> drivers/thermal/thermal_core.c | 13 +++++++++---- >> drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 2 +- >> drivers/thermal/x86_pkg_temp_thermal.c | 2 +- >> include/linux/thermal.h | 2 +- >> 16 files changed, 30 insertions(+), 20 deletions(-) >> >> diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt >> index a71bd5b..4b4a052 100644 >> --- a/Documentation/thermal/sysfs-api.txt >> +++ b/Documentation/thermal/sysfs-api.txt >> @@ -64,7 +64,9 @@ temperature) and throttle appropriate devices. >> performing passive cooling. >> polling_delay: number of milliseconds to wait between polls when checking >> whether trip points have been crossed (0 for interrupt driven systems). >> - >> + add_hwmon: a boolean to indicate if the thermal to hwmon sysfs interface >> + is required. When add_hwmon == true, a hwmon sysfs interface >> + will be created. When add_hwmon == false, nothing will be done >> >> 1.1.2 void thermal_zone_device_unregister(struct thermal_zone_device *tz) >> >> diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c >> index a33821c..4d542b4 100644 >> --- a/drivers/acpi/thermal.c >> +++ b/drivers/acpi/thermal.c >> @@ -916,12 +916,14 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) >> thermal_zone_device_register("acpitz", trips, 0, tz, >> &acpi_thermal_zone_ops, NULL, >> tz->trips.passive.tsp*100, >> - tz->polling_frequency*100); >> + tz->polling_frequency*100, >> + true); >> else >> tz->thermal_zone = >> thermal_zone_device_register("acpitz", trips, 0, tz, >> &acpi_thermal_zone_ops, NULL, >> - 0, tz->polling_frequency*100); >> + 0, tz->polling_frequency*100, >> + true); >> if (IS_ERR(tz->thermal_zone)) >> return -ENODEV; >> >> diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c >> index f94467c..004d9ba0 100644 >> --- a/drivers/platform/x86/acerhdf.c >> +++ b/drivers/platform/x86/acerhdf.c >> @@ -663,7 +663,8 @@ static int acerhdf_register_thermal(void) >> >> thz_dev = thermal_zone_device_register("acerhdf", 1, 0, NULL, >> &acerhdf_dev_ops, NULL, 0, >> - (kernelmode) ? interval*1000 : 0); >> + (kernelmode) ? interval*1000 : 0, >> + true); >> if (IS_ERR(thz_dev)) >> return -EINVAL; >> >> diff --git a/drivers/platform/x86/intel_mid_thermal.c b/drivers/platform/x86/intel_mid_thermal.c >> index 81c491e..efea0bf 100644 >> --- a/drivers/platform/x86/intel_mid_thermal.c >> +++ b/drivers/platform/x86/intel_mid_thermal.c >> @@ -502,7 +502,7 @@ static int mid_thermal_probe(struct platform_device *pdev) >> goto err; >> } >> pinfo->tzd[i] = thermal_zone_device_register(name[i], >> - 0, 0, td_info, &tzd_ops, NULL, 0, 0); >> + 0, 0, td_info, &tzd_ops, NULL, 0, 0, true); >> if (IS_ERR(pinfo->tzd[i])) { >> kfree(td_info); >> ret = PTR_ERR(pinfo->tzd[i]); >> diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c >> index 3b2d5df..5f39914 100644 >> --- a/drivers/power/power_supply_core.c >> +++ b/drivers/power/power_supply_core.c >> @@ -359,7 +359,7 @@ static int psy_register_thermal(struct power_supply *psy) >> for (i = 0; i < psy->num_properties; i++) { >> if (psy->properties[i] == POWER_SUPPLY_PROP_TEMP) { >> psy->tzd = thermal_zone_device_register(psy->name, 0, 0, >> - psy, &psy_tzd_ops, NULL, 0, 0); >> + psy, &psy_tzd_ops, NULL, 0, 0, true); >> if (IS_ERR(psy->tzd)) >> return PTR_ERR(psy->tzd); >> break; >> diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c >> index 5e53212..bc54c80 100644 >> --- a/drivers/thermal/armada_thermal.c >> +++ b/drivers/thermal/armada_thermal.c >> @@ -182,7 +182,7 @@ static int armada_thermal_probe(struct platform_device *pdev) >> priv->ops->init_sensor(priv); >> >> thermal = thermal_zone_device_register("armada_thermal", 0, 0, >> - priv, &ops, NULL, 0, 0); >> + priv, &ops, NULL, 0, 0, true); >> if (IS_ERR(thermal)) { >> dev_err(&pdev->dev, >> "Failed to register thermal zone device\n"); >> diff --git a/drivers/thermal/db8500_thermal.c b/drivers/thermal/db8500_thermal.c >> index 1e3b3bf..439a854 100644 >> --- a/drivers/thermal/db8500_thermal.c >> +++ b/drivers/thermal/db8500_thermal.c >> @@ -447,7 +447,7 @@ static int db8500_thermal_probe(struct platform_device *pdev) >> } >> >> pzone->therm_dev = thermal_zone_device_register("db8500_thermal_zone", >> - ptrips->num_trips, 0, pzone, &thdev_ops, NULL, 0, 0); >> + ptrips->num_trips, 0, pzone, &thdev_ops, NULL, 0, 0, true); >> >> if (IS_ERR(pzone->therm_dev)) { >> dev_err(&pdev->dev, "Register thermal zone device failed.\n"); >> diff --git a/drivers/thermal/dove_thermal.c b/drivers/thermal/dove_thermal.c >> index 828f5e3..61f2247 100644 >> --- a/drivers/thermal/dove_thermal.c >> +++ b/drivers/thermal/dove_thermal.c >> @@ -155,7 +155,7 @@ static int dove_thermal_probe(struct platform_device *pdev) >> } >> >> thermal = thermal_zone_device_register("dove_thermal", 0, 0, >> - priv, &ops, NULL, 0, 0); >> + priv, &ops, NULL, 0, 0, true); >> if (IS_ERR(thermal)) { >> dev_err(&pdev->dev, >> "Failed to register thermal zone device\n"); >> diff --git a/drivers/thermal/exynos_thermal.c b/drivers/thermal/exynos_thermal.c >> index 9af4b93..6ffadd3 100644 >> --- a/drivers/thermal/exynos_thermal.c >> +++ b/drivers/thermal/exynos_thermal.c >> @@ -469,7 +469,7 @@ static int exynos_register_thermal(struct thermal_sensor_conf *sensor_conf) >> th_zone->therm_dev = thermal_zone_device_register(sensor_conf->name, >> EXYNOS_ZONE_COUNT, 0, NULL, &exynos_dev_ops, NULL, 0, >> sensor_conf->trip_data.trigger_falling ? >> - 0 : IDLE_INTERVAL); >> + 0 : IDLE_INTERVAL, true); >> >> if (IS_ERR(th_zone->therm_dev)) { >> pr_err("Failed to register thermal zone device\n"); >> diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c >> index 3b034a0..fb8853e 100644 >> --- a/drivers/thermal/kirkwood_thermal.c >> +++ b/drivers/thermal/kirkwood_thermal.c >> @@ -85,7 +85,7 @@ static int kirkwood_thermal_probe(struct platform_device *pdev) >> return PTR_ERR(priv->sensor); >> >> thermal = thermal_zone_device_register("kirkwood_thermal", 0, 0, >> - priv, &ops, NULL, 0, 0); >> + priv, &ops, NULL, 0, 0, true); >> if (IS_ERR(thermal)) { >> dev_err(&pdev->dev, >> "Failed to register thermal zone device\n"); >> diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c >> index 88f92e1..64ae530 100644 >> --- a/drivers/thermal/rcar_thermal.c >> +++ b/drivers/thermal/rcar_thermal.c >> @@ -439,7 +439,7 @@ static int rcar_thermal_probe(struct platform_device *pdev) >> priv->zone = thermal_zone_device_register("rcar_thermal", >> 1, 0, priv, >> &rcar_thermal_zone_ops, NULL, 0, >> - idle); >> + idle, true); >> if (IS_ERR(priv->zone)) { >> dev_err(dev, "can't register thermal zone\n"); >> ret = PTR_ERR(priv->zone); >> diff --git a/drivers/thermal/spear_thermal.c b/drivers/thermal/spear_thermal.c >> index ab79ea4..ec0c44d 100644 >> --- a/drivers/thermal/spear_thermal.c >> +++ b/drivers/thermal/spear_thermal.c >> @@ -140,7 +140,7 @@ static int spear_thermal_probe(struct platform_device *pdev) >> writel_relaxed(stdev->flags, stdev->thermal_base); >> >> spear_thermal = thermal_zone_device_register("spear_thermal", 0, 0, >> - stdev, &ops, NULL, 0, 0); >> + stdev, &ops, NULL, 0, 0, true); >> if (IS_ERR(spear_thermal)) { >> dev_err(&pdev->dev, "thermal zone device is NULL\n"); >> ret = PTR_ERR(spear_thermal); >> diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c >> index 247528b..d949ab0 100644 >> --- a/drivers/thermal/thermal_core.c >> +++ b/drivers/thermal/thermal_core.c >> @@ -1344,6 +1344,9 @@ static void remove_trip_attrs(struct thermal_zone_device *tz) >> * @polling_delay: number of milliseconds to wait between polls when checking >> * whether trip points have been crossed (0 for interrupt >> * driven systems) >> + * @add_hwmon: a boolean to indicate if the thermal to hwmon sysfs interface >> + * is required. When add_hwmon == true, a hwmon sysfs interface >> + * will be created. When add_hwmon == false, nothing will be done >> * >> * This interface function adds a new thermal zone device (sensor) to >> * /sys/class/thermal folder as thermal_zone[0-*]. It tries to bind all the >> @@ -1359,7 +1362,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, >> int trips, int mask, void *devdata, >> const struct thermal_zone_device_ops *ops, >> const struct thermal_zone_params *tzp, >> - int passive_delay, int polling_delay) >> + int passive_delay, int polling_delay, bool add_hwmon) >> { >> struct thermal_zone_device *tz; >> enum thermal_trip_type trip_type; >> @@ -1462,9 +1465,11 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, >> >> mutex_unlock(&thermal_governor_lock); >> >> - result = thermal_add_hwmon_sysfs(tz); >> - if (result) >> - goto unregister; >> + if (add_hwmon) { >> + result = thermal_add_hwmon_sysfs(tz); >> + if (result) >> + goto unregister; >> + } >> >> mutex_lock(&thermal_list_lock); >> list_add_tail(&tz->node, &thermal_tz_list); >> diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c >> index 4c5f55c37..5ab613a 100644 >> --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c >> +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c >> @@ -306,7 +306,7 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id, >> data->ti_thermal = thermal_zone_device_register(domain, >> OMAP_TRIP_NUMBER, 0, data, &ti_thermal_ops, >> NULL, FAST_TEMP_MONITORING_RATE, >> - FAST_TEMP_MONITORING_RATE); >> + FAST_TEMP_MONITORING_RATE, true); >> if (IS_ERR(data->ti_thermal)) { >> dev_err(bgp->dev, "thermal zone device is NULL\n"); >> return PTR_ERR(data->ti_thermal); >> diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c >> index f36950e..74eb4c0 100644 >> --- a/drivers/thermal/x86_pkg_temp_thermal.c >> +++ b/drivers/thermal/x86_pkg_temp_thermal.c >> @@ -444,7 +444,7 @@ static int pkg_temp_thermal_device_add(unsigned int cpu) >> thres_count, >> (thres_count == MAX_NUMBER_OF_TRIPS) ? >> 0x03 : 0x01, >> - phy_dev_entry, &tzone_ops, NULL, 0, 0); >> + phy_dev_entry, &tzone_ops, NULL, 0, 0, true); >> if (IS_ERR(phy_dev_entry->tzone)) { >> err = PTR_ERR(phy_dev_entry->tzone); >> goto err_ret_free; >> diff --git a/include/linux/thermal.h b/include/linux/thermal.h >> index a386a1c..88148b9 100644 >> --- a/include/linux/thermal.h >> +++ b/include/linux/thermal.h >> @@ -226,7 +226,7 @@ struct thermal_genl_event { >> /* Function declarations */ >> struct thermal_zone_device *thermal_zone_device_register(const char *, int, int, >> void *, const struct thermal_zone_device_ops *, >> - const struct thermal_zone_params *, int, int); >> + const struct thermal_zone_params *, int, int, bool); >> void thermal_zone_device_unregister(struct thermal_zone_device *); >> >> int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int, >> -- You have got to be excited about what you are doing. (L. Lamport) Eduardo Valentin -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 295 bytes Desc: OpenPGP digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130827/74d2a7ff/attachment-0001.sig> ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/5] drivers: thermal: make usage of CONFIG_THERMAL_HWMON optional 2013-08-27 18:26 ` Eduardo Valentin @ 2013-08-27 21:17 ` Rafael J. Wysocki 2013-08-28 0:13 ` Zhang Rui 0 siblings, 1 reply; 8+ messages in thread From: Rafael J. Wysocki @ 2013-08-27 21:17 UTC (permalink / raw) To: linux-arm-kernel On Tuesday, August 27, 2013 02:26:41 PM Eduardo Valentin wrote: > On 23-08-2013 19:08, Rafael J. Wysocki wrote: > > On Friday, August 23, 2013 06:03:14 PM Eduardo Valentin wrote: > >> When registering a new thermal_device, the thermal framework > >> will always add a hwmon sysfs interface. > >> > >> This patch adds a flag to make this behavior optional. Now > >> when registering a new thermal device, the caller needs > >> to say if the hwmon interface is required. > >> > >> In order to keep same behavior as of today, all current > >> calls will by default create the hwmon interface. > > > > Well, instead of modifying all of the callers this way, why don't > > you add new versions taking the additional argument as, for example, > > > > thermal_zone_device_register_full() > > > > and redefine the old ones as static inline wrappers, for example > > > > static inline struct thermal_zone_device *thermal_zone_device_register(args) > > { > > return thermal_zone_device_register_full(args, true); > > } > > > > ? > > Yeah, that is another way to go and I thought of doing it like that. I > just could not come out with a good API naming: > > thermal_zone_device_register_full(all args) > > thermal_zone_device_register(args) /* on hwmon == true */ > thermal_zone_device_register_no_hwmon(args) /* on hwmon == false */ > > Would this sound reasonable naming? Yeah, sounds good to me. Thanks, Rafael ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/5] drivers: thermal: make usage of CONFIG_THERMAL_HWMON optional 2013-08-27 21:17 ` Rafael J. Wysocki @ 2013-08-28 0:13 ` Zhang Rui 2013-08-28 13:15 ` Eduardo Valentin 2013-08-29 20:12 ` [PATCHv2 " Eduardo Valentin 0 siblings, 2 replies; 8+ messages in thread From: Zhang Rui @ 2013-08-28 0:13 UTC (permalink / raw) To: linux-arm-kernel On ?, 2013-08-27 at 23:17 +0200, Rafael J. Wysocki wrote: > On Tuesday, August 27, 2013 02:26:41 PM Eduardo Valentin wrote: > > On 23-08-2013 19:08, Rafael J. Wysocki wrote: > > > On Friday, August 23, 2013 06:03:14 PM Eduardo Valentin wrote: > > >> When registering a new thermal_device, the thermal framework > > >> will always add a hwmon sysfs interface. > > >> > > >> This patch adds a flag to make this behavior optional. Now > > >> when registering a new thermal device, the caller needs > > >> to say if the hwmon interface is required. > > >> > > >> In order to keep same behavior as of today, all current > > >> calls will by default create the hwmon interface. > > > > > > Well, instead of modifying all of the callers this way, why don't > > > you add new versions taking the additional argument as, for example, > > > > > > thermal_zone_device_register_full() > > > > > > and redefine the old ones as static inline wrappers, for example > > > > > > static inline struct thermal_zone_device *thermal_zone_device_register(args) > > > { > > > return thermal_zone_device_register_full(args, true); > > > } > > > > > > ? > > > > Yeah, that is another way to go and I thought of doing it like that. I > > just could not come out with a good API naming: > > > > thermal_zone_device_register_full(all args) > > > > thermal_zone_device_register(args) /* on hwmon == true */ > > thermal_zone_device_register_no_hwmon(args) /* on hwmon == false */ > > > > Would this sound reasonable naming? > > Yeah, sounds good to me. > Well, actually, Tianyu is working on a patch set to move all the thermal_zone_device_register() parameters to struct thermal_zone_params. But with that patch set done, what you need to do next is just to introduce a new field in struct thermal_zone_params and make sure 0 means registering hwmon sysfs I/F. thanks, rui > Thanks, > Rafael > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/5] drivers: thermal: make usage of CONFIG_THERMAL_HWMON optional 2013-08-28 0:13 ` Zhang Rui @ 2013-08-28 13:15 ` Eduardo Valentin 2013-08-29 20:12 ` [PATCHv2 " Eduardo Valentin 1 sibling, 0 replies; 8+ messages in thread From: Eduardo Valentin @ 2013-08-28 13:15 UTC (permalink / raw) To: linux-arm-kernel On 27-08-2013 20:13, Zhang Rui wrote: > On ?, 2013-08-27 at 23:17 +0200, Rafael J. Wysocki wrote: >> On Tuesday, August 27, 2013 02:26:41 PM Eduardo Valentin wrote: >>> On 23-08-2013 19:08, Rafael J. Wysocki wrote: >>>> On Friday, August 23, 2013 06:03:14 PM Eduardo Valentin wrote: >>>>> When registering a new thermal_device, the thermal framework >>>>> will always add a hwmon sysfs interface. >>>>> >>>>> This patch adds a flag to make this behavior optional. Now >>>>> when registering a new thermal device, the caller needs >>>>> to say if the hwmon interface is required. >>>>> >>>>> In order to keep same behavior as of today, all current >>>>> calls will by default create the hwmon interface. >>>> >>>> Well, instead of modifying all of the callers this way, why don't >>>> you add new versions taking the additional argument as, for example, >>>> >>>> thermal_zone_device_register_full() >>>> >>>> and redefine the old ones as static inline wrappers, for example >>>> >>>> static inline struct thermal_zone_device *thermal_zone_device_register(args) >>>> { >>>> return thermal_zone_device_register_full(args, true); >>>> } >>>> >>>> ? >>> >>> Yeah, that is another way to go and I thought of doing it like that. I >>> just could not come out with a good API naming: >>> >>> thermal_zone_device_register_full(all args) >>> >>> thermal_zone_device_register(args) /* on hwmon == true */ >>> thermal_zone_device_register_no_hwmon(args) /* on hwmon == false */ >>> >>> Would this sound reasonable naming? >> >> Yeah, sounds good to me. >> > Well, actually, Tianyu is working on a patch set to move all the > thermal_zone_device_register() parameters to struct thermal_zone_params. > > But with that patch set done, what you need to do next is just to > introduce a new field in struct thermal_zone_params and make sure 0 > means registering hwmon sysfs I/F. Rui, Do you have a pointer to his patch? > > thanks, > rui > >> Thanks, >> Rafael >> > > > > -- You have got to be excited about what you are doing. (L. Lamport) Eduardo Valentin -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 295 bytes Desc: OpenPGP digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130828/6397da74/attachment.sig> ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCHv2 3/5] drivers: thermal: make usage of CONFIG_THERMAL_HWMON optional 2013-08-28 0:13 ` Zhang Rui 2013-08-28 13:15 ` Eduardo Valentin @ 2013-08-29 20:12 ` Eduardo Valentin 2013-09-02 14:09 ` Eduardo Valentin 1 sibling, 1 reply; 8+ messages in thread From: Eduardo Valentin @ 2013-08-29 20:12 UTC (permalink / raw) To: linux-arm-kernel When registering a new thermal_device, the thermal framework will always add a hwmon sysfs interface. This patch adds a flag to make this behavior optional. Now when registering a new thermal device, the caller can optionally inform if hwmon interface is desirable. This can be done by means of passing a thermal_zone_params.no_hwmon == true. In order to keep same behavior as of today, all current calls will by default create the hwmon interface. Cc: linux-arm-kernel at lists.infradead.org Cc: linux-kernel at vger.kernel.org Cc: linux-pm at vger.kernel.org Cc: Zhang Rui <rui.zhang@intel.com> Suggested-by: Wei Ni <wni@nvidia.com> Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com> --- Documentation/thermal/sysfs-api.txt | 5 +++++ drivers/thermal/thermal_core.c | 8 +++++--- include/linux/thermal.h | 8 ++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) --- Hello all, So, here is then a different way of implementing same feature. As requested by Rui, now the flag goes via thermal_zone_params, because this seams to be the preferred way, at least in near future. Using this method the amount of subsystems involved is reduced to 1: thermal, as requested by Raphael. I just made is a negative flag in order to keep the same behavior of the existing drivers, without changing them. The flag is documented though. All best, diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt index a71bd5b..37c5486 100644 --- a/Documentation/thermal/sysfs-api.txt +++ b/Documentation/thermal/sysfs-api.txt @@ -142,6 +142,11 @@ temperature) and throttle appropriate devices. This is an optional feature where some platforms can choose not to provide this data. .governor_name: Name of the thermal governor used for this zone + .no_hwmon: a boolean to indicate if the thermal to hwmon sysfs interface + is required. when no_hwmon == false, a hwmon sysfs interface + will be created. when no_hwmon == true, nothing will be done. + In case the thermal_zone_params is NULL, the hwmon interface + will be created (for backward compatibility). .num_tbps: Number of thermal_bind_params entries for this zone .tbp: thermal_bind_params entries diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 247528b..51648bf 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -1462,9 +1462,11 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, mutex_unlock(&thermal_governor_lock); - result = thermal_add_hwmon_sysfs(tz); - if (result) - goto unregister; + if (!tz->tzp || !tz->tzp->no_hwmon) { + result = thermal_add_hwmon_sysfs(tz); + if (result) + goto unregister; + } mutex_lock(&thermal_list_lock); list_add_tail(&tz->node, &thermal_tz_list); diff --git a/include/linux/thermal.h b/include/linux/thermal.h index a386a1c..b4a975f 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -214,6 +214,14 @@ struct thermal_bind_params { /* Structure to define Thermal Zone parameters */ struct thermal_zone_params { char governor_name[THERMAL_NAME_LENGTH]; + + /* + * a boolean to indicate if the thermal to hwmon sysfs interface + * is required. when no_hwmon == false, a hwmon sysfs interface + * will be created. when no_hwmon == true, nothing will be done + */ + bool no_hwmon; + int num_tbps; /* Number of tbp entries */ struct thermal_bind_params *tbp; }; -- 1.8.2.1.342.gfa7285d ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCHv2 3/5] drivers: thermal: make usage of CONFIG_THERMAL_HWMON optional 2013-08-29 20:12 ` [PATCHv2 " Eduardo Valentin @ 2013-09-02 14:09 ` Eduardo Valentin 0 siblings, 0 replies; 8+ messages in thread From: Eduardo Valentin @ 2013-09-02 14:09 UTC (permalink / raw) To: linux-arm-kernel Hi, On 29-08-2013 16:12, Eduardo Valentin wrote: > When registering a new thermal_device, the thermal framework > will always add a hwmon sysfs interface. > > This patch adds a flag to make this behavior optional. Now > when registering a new thermal device, the caller can > optionally inform if hwmon interface is desirable. This can > be done by means of passing a thermal_zone_params.no_hwmon == true. > > In order to keep same behavior as of today, all current > calls will by default create the hwmon interface. > > Cc: linux-arm-kernel at lists.infradead.org > Cc: linux-kernel at vger.kernel.org > Cc: linux-pm at vger.kernel.org > Cc: Zhang Rui <rui.zhang@intel.com> > Suggested-by: Wei Ni <wni@nvidia.com> > Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com> > --- > Documentation/thermal/sysfs-api.txt | 5 +++++ > drivers/thermal/thermal_core.c | 8 +++++--- > include/linux/thermal.h | 8 ++++++++ > 3 files changed, 18 insertions(+), 3 deletions(-) > --- > > Hello all, > > So, here is then a different way of implementing same feature. > As requested by Rui, now the flag goes via thermal_zone_params, > because this seams to be the preferred way, at least in near future. > > Using this method the amount of subsystems involved is reduced to 1: > thermal, as requested by Raphael. I just made is a negative flag > in order to keep the same behavior of the existing drivers, without > changing them. The flag is documented though. > Objections on this way of adding this flag? Rui, If you are OK, I can add this series to my tree too. > All best, > > > diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt > index a71bd5b..37c5486 100644 > --- a/Documentation/thermal/sysfs-api.txt > +++ b/Documentation/thermal/sysfs-api.txt > @@ -142,6 +142,11 @@ temperature) and throttle appropriate devices. > This is an optional feature where some platforms can choose not to > provide this data. > .governor_name: Name of the thermal governor used for this zone > + .no_hwmon: a boolean to indicate if the thermal to hwmon sysfs interface > + is required. when no_hwmon == false, a hwmon sysfs interface > + will be created. when no_hwmon == true, nothing will be done. > + In case the thermal_zone_params is NULL, the hwmon interface > + will be created (for backward compatibility). > .num_tbps: Number of thermal_bind_params entries for this zone > .tbp: thermal_bind_params entries > > diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c > index 247528b..51648bf 100644 > --- a/drivers/thermal/thermal_core.c > +++ b/drivers/thermal/thermal_core.c > @@ -1462,9 +1462,11 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, > > mutex_unlock(&thermal_governor_lock); > > - result = thermal_add_hwmon_sysfs(tz); > - if (result) > - goto unregister; > + if (!tz->tzp || !tz->tzp->no_hwmon) { > + result = thermal_add_hwmon_sysfs(tz); > + if (result) > + goto unregister; > + } > > mutex_lock(&thermal_list_lock); > list_add_tail(&tz->node, &thermal_tz_list); > diff --git a/include/linux/thermal.h b/include/linux/thermal.h > index a386a1c..b4a975f 100644 > --- a/include/linux/thermal.h > +++ b/include/linux/thermal.h > @@ -214,6 +214,14 @@ struct thermal_bind_params { > /* Structure to define Thermal Zone parameters */ > struct thermal_zone_params { > char governor_name[THERMAL_NAME_LENGTH]; > + > + /* > + * a boolean to indicate if the thermal to hwmon sysfs interface > + * is required. when no_hwmon == false, a hwmon sysfs interface > + * will be created. when no_hwmon == true, nothing will be done > + */ > + bool no_hwmon; > + > int num_tbps; /* Number of tbp entries */ > struct thermal_bind_params *tbp; > }; > -- You have got to be excited about what you are doing. (L. Lamport) Eduardo Valentin -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 295 bytes Desc: OpenPGP digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130902/72a1609d/attachment.sig> ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-09-02 14:09 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1377295396-17289-1-git-send-email-eduardo.valentin@ti.com>
2013-08-23 22:03 ` [PATCH 3/5] drivers: thermal: make usage of CONFIG_THERMAL_HWMON optional Eduardo Valentin
2013-08-23 23:08 ` Rafael J. Wysocki
2013-08-27 18:26 ` Eduardo Valentin
2013-08-27 21:17 ` Rafael J. Wysocki
2013-08-28 0:13 ` Zhang Rui
2013-08-28 13:15 ` Eduardo Valentin
2013-08-29 20:12 ` [PATCHv2 " Eduardo Valentin
2013-09-02 14:09 ` Eduardo Valentin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).