From: Rafael J. Wysocki <[email protected]>
All of the remaining callers of thermal_zone_device_register()
can use thermal_tripless_zone_device_register(), so make them
do so in order to allow the former to be dropped.
No intentional functional impact.
Signed-off-by: Rafael J. Wysocki <[email protected]>
---
drivers/power/supply/power_supply_core.c | 4 ++--
drivers/thermal/armada_thermal.c | 5 +++--
drivers/thermal/dove_thermal.c | 4 ++--
drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 6 +++---
drivers/thermal/kirkwood_thermal.c | 4 ++--
drivers/thermal/spear_thermal.c | 4 ++--
6 files changed, 14 insertions(+), 13 deletions(-)
Index: linux-pm/drivers/power/supply/power_supply_core.c
===================================================================
--- linux-pm.orig/drivers/power/supply/power_supply_core.c
+++ linux-pm/drivers/power/supply/power_supply_core.c
@@ -1305,8 +1305,8 @@ static int psy_register_thermal(struct p
/* Register battery zone device psy reports temperature */
if (psy_has_property(psy->desc, POWER_SUPPLY_PROP_TEMP)) {
- psy->tzd = thermal_zone_device_register(psy->desc->name,
- 0, 0, psy, &psy_tzd_ops, NULL, 0, 0);
+ psy->tzd = thermal_tripless_zone_device_register(psy->desc->name,
+ psy, &psy_tzd_ops, NULL);
if (IS_ERR(psy->tzd))
return PTR_ERR(psy->tzd);
ret = thermal_zone_device_enable(psy->tzd);
Index: linux-pm/drivers/thermal/armada_thermal.c
===================================================================
--- linux-pm.orig/drivers/thermal/armada_thermal.c
+++ linux-pm/drivers/thermal/armada_thermal.c
@@ -876,8 +876,9 @@ static int armada_thermal_probe(struct p
/* Wait the sensors to be valid */
armada_wait_sensor_validity(priv);
- tz = thermal_zone_device_register(priv->zone_name, 0, 0, priv,
- &legacy_ops, NULL, 0, 0);
+ tz = thermal_tripless_zone_device_register(priv->zone_name,
+ priv, &legacy_ops,
+ NULL);
if (IS_ERR(tz)) {
dev_err(&pdev->dev,
"Failed to register thermal zone device\n");
Index: linux-pm/drivers/thermal/dove_thermal.c
===================================================================
--- linux-pm.orig/drivers/thermal/dove_thermal.c
+++ linux-pm/drivers/thermal/dove_thermal.c
@@ -139,8 +139,8 @@ static int dove_thermal_probe(struct pla
return ret;
}
- thermal = thermal_zone_device_register("dove_thermal", 0, 0,
- priv, &ops, NULL, 0, 0);
+ thermal = thermal_tripless_zone_device_register("dove_thermal", priv,
+ &ops, NULL);
if (IS_ERR(thermal)) {
dev_err(&pdev->dev,
"Failed to register thermal zone device\n");
Index: linux-pm/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
===================================================================
--- linux-pm.orig/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
+++ linux-pm/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
@@ -609,9 +609,9 @@ static int int3400_thermal_probe(struct
evaluate_odvp(priv);
- priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
- priv, &int3400_thermal_ops,
- &int3400_thermal_params, 0, 0);
+ priv->thermal = thermal_tripless_zone_device_register("INT3400 Thermal", priv,
+ &int3400_thermal_ops,
+ &int3400_thermal_params);
if (IS_ERR(priv->thermal)) {
result = PTR_ERR(priv->thermal);
goto free_art_trt;
Index: linux-pm/drivers/thermal/kirkwood_thermal.c
===================================================================
--- linux-pm.orig/drivers/thermal/kirkwood_thermal.c
+++ linux-pm/drivers/thermal/kirkwood_thermal.c
@@ -71,8 +71,8 @@ static int kirkwood_thermal_probe(struct
if (IS_ERR(priv->sensor))
return PTR_ERR(priv->sensor);
- thermal = thermal_zone_device_register("kirkwood_thermal", 0, 0,
- priv, &ops, NULL, 0, 0);
+ thermal = thermal_tripless_zone_device_register("kirkwood_thermal",
+ priv, &ops, NULL);
if (IS_ERR(thermal)) {
dev_err(&pdev->dev,
"Failed to register thermal zone device\n");
Index: linux-pm/drivers/thermal/spear_thermal.c
===================================================================
--- linux-pm.orig/drivers/thermal/spear_thermal.c
+++ linux-pm/drivers/thermal/spear_thermal.c
@@ -122,8 +122,8 @@ static int spear_thermal_probe(struct pl
stdev->flags = val;
writel_relaxed(stdev->flags, stdev->thermal_base);
- spear_thermal = thermal_zone_device_register("spear_thermal", 0, 0,
- stdev, &ops, NULL, 0, 0);
+ spear_thermal = thermal_tripless_zone_device_register("spear_thermal",
+ stdev, &ops, NULL);
if (IS_ERR(spear_thermal)) {
dev_err(&pdev->dev, "thermal zone device is NULL\n");
ret = PTR_ERR(spear_thermal);
On Wed, Aug 30, 2023 at 8:36 PM Rafael J. Wysocki <[email protected]> wrote:
>
> From: Rafael J. Wysocki <[email protected]>
>
> All of the remaining callers of thermal_zone_device_register()
> can use thermal_tripless_zone_device_register(), so make them
> do so in order to allow the former to be dropped.
>
> No intentional functional impact.
>
> Signed-off-by: Rafael J. Wysocki <[email protected]>
Due to the lack of negative feedback, I'm going to assume that this
patch in particular and the entire series in general is fine with
everyone in the CC.
> ---
> drivers/power/supply/power_supply_core.c | 4 ++--
> drivers/thermal/armada_thermal.c | 5 +++--
> drivers/thermal/dove_thermal.c | 4 ++--
> drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 6 +++---
> drivers/thermal/kirkwood_thermal.c | 4 ++--
> drivers/thermal/spear_thermal.c | 4 ++--
> 6 files changed, 14 insertions(+), 13 deletions(-)
>
> Index: linux-pm/drivers/power/supply/power_supply_core.c
> ===================================================================
> --- linux-pm.orig/drivers/power/supply/power_supply_core.c
> +++ linux-pm/drivers/power/supply/power_supply_core.c
> @@ -1305,8 +1305,8 @@ static int psy_register_thermal(struct p
>
> /* Register battery zone device psy reports temperature */
> if (psy_has_property(psy->desc, POWER_SUPPLY_PROP_TEMP)) {
> - psy->tzd = thermal_zone_device_register(psy->desc->name,
> - 0, 0, psy, &psy_tzd_ops, NULL, 0, 0);
> + psy->tzd = thermal_tripless_zone_device_register(psy->desc->name,
> + psy, &psy_tzd_ops, NULL);
> if (IS_ERR(psy->tzd))
> return PTR_ERR(psy->tzd);
> ret = thermal_zone_device_enable(psy->tzd);
> Index: linux-pm/drivers/thermal/armada_thermal.c
> ===================================================================
> --- linux-pm.orig/drivers/thermal/armada_thermal.c
> +++ linux-pm/drivers/thermal/armada_thermal.c
> @@ -876,8 +876,9 @@ static int armada_thermal_probe(struct p
> /* Wait the sensors to be valid */
> armada_wait_sensor_validity(priv);
>
> - tz = thermal_zone_device_register(priv->zone_name, 0, 0, priv,
> - &legacy_ops, NULL, 0, 0);
> + tz = thermal_tripless_zone_device_register(priv->zone_name,
> + priv, &legacy_ops,
> + NULL);
> if (IS_ERR(tz)) {
> dev_err(&pdev->dev,
> "Failed to register thermal zone device\n");
> Index: linux-pm/drivers/thermal/dove_thermal.c
> ===================================================================
> --- linux-pm.orig/drivers/thermal/dove_thermal.c
> +++ linux-pm/drivers/thermal/dove_thermal.c
> @@ -139,8 +139,8 @@ static int dove_thermal_probe(struct pla
> return ret;
> }
>
> - thermal = thermal_zone_device_register("dove_thermal", 0, 0,
> - priv, &ops, NULL, 0, 0);
> + thermal = thermal_tripless_zone_device_register("dove_thermal", priv,
> + &ops, NULL);
> if (IS_ERR(thermal)) {
> dev_err(&pdev->dev,
> "Failed to register thermal zone device\n");
> Index: linux-pm/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
> ===================================================================
> --- linux-pm.orig/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
> +++ linux-pm/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
> @@ -609,9 +609,9 @@ static int int3400_thermal_probe(struct
>
> evaluate_odvp(priv);
>
> - priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
> - priv, &int3400_thermal_ops,
> - &int3400_thermal_params, 0, 0);
> + priv->thermal = thermal_tripless_zone_device_register("INT3400 Thermal", priv,
> + &int3400_thermal_ops,
> + &int3400_thermal_params);
> if (IS_ERR(priv->thermal)) {
> result = PTR_ERR(priv->thermal);
> goto free_art_trt;
> Index: linux-pm/drivers/thermal/kirkwood_thermal.c
> ===================================================================
> --- linux-pm.orig/drivers/thermal/kirkwood_thermal.c
> +++ linux-pm/drivers/thermal/kirkwood_thermal.c
> @@ -71,8 +71,8 @@ static int kirkwood_thermal_probe(struct
> if (IS_ERR(priv->sensor))
> return PTR_ERR(priv->sensor);
>
> - thermal = thermal_zone_device_register("kirkwood_thermal", 0, 0,
> - priv, &ops, NULL, 0, 0);
> + thermal = thermal_tripless_zone_device_register("kirkwood_thermal",
> + priv, &ops, NULL);
> if (IS_ERR(thermal)) {
> dev_err(&pdev->dev,
> "Failed to register thermal zone device\n");
> Index: linux-pm/drivers/thermal/spear_thermal.c
> ===================================================================
> --- linux-pm.orig/drivers/thermal/spear_thermal.c
> +++ linux-pm/drivers/thermal/spear_thermal.c
> @@ -122,8 +122,8 @@ static int spear_thermal_probe(struct pl
> stdev->flags = val;
> writel_relaxed(stdev->flags, stdev->thermal_base);
>
> - spear_thermal = thermal_zone_device_register("spear_thermal", 0, 0,
> - stdev, &ops, NULL, 0, 0);
> + spear_thermal = thermal_tripless_zone_device_register("spear_thermal",
> + stdev, &ops, NULL);
> if (IS_ERR(spear_thermal)) {
> dev_err(&pdev->dev, "thermal zone device is NULL\n");
> ret = PTR_ERR(spear_thermal);
>
>
>
On Thu, Aug 31, 2023 at 8:58 AM Miquel Raynal <[email protected]> wrote:
>
> Hello,
>
> [email protected] wrote on Wed, 30 Aug 2023 18:14:57 +0200:
>
> > From: Rafael J. Wysocki <[email protected]>
> >
> > All of the remaining callers of thermal_zone_device_register()
> > can use thermal_tripless_zone_device_register(), so make them
> > do so in order to allow the former to be dropped.
> >
> > No intentional functional impact.
> >
> > Signed-off-by: Rafael J. Wysocki <[email protected]>
> > ---
>
> > drivers/thermal/armada_thermal.c | 5 +++--
>
> For armada:
> Acked-by: Miquel Raynal <[email protected]>
Thank you!
Hi,
On Wed, Aug 30, 2023 at 06:14:57PM +0200, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <[email protected]>
>
> All of the remaining callers of thermal_zone_device_register()
> can use thermal_tripless_zone_device_register(), so make them
> do so in order to allow the former to be dropped.
>
> No intentional functional impact.
>
> Signed-off-by: Rafael J. Wysocki <[email protected]>
> ---
> drivers/power/supply/power_supply_core.c | 4 ++--
For power-supply:
Acked-by: Sebastian Reichel <[email protected]>
-- Sebastian
> drivers/thermal/armada_thermal.c | 5 +++--
> drivers/thermal/dove_thermal.c | 4 ++--
> drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 6 +++---
> drivers/thermal/kirkwood_thermal.c | 4 ++--
> drivers/thermal/spear_thermal.c | 4 ++--
> 6 files changed, 14 insertions(+), 13 deletions(-)
>
> Index: linux-pm/drivers/power/supply/power_supply_core.c
> ===================================================================
> --- linux-pm.orig/drivers/power/supply/power_supply_core.c
> +++ linux-pm/drivers/power/supply/power_supply_core.c
> @@ -1305,8 +1305,8 @@ static int psy_register_thermal(struct p
>
> /* Register battery zone device psy reports temperature */
> if (psy_has_property(psy->desc, POWER_SUPPLY_PROP_TEMP)) {
> - psy->tzd = thermal_zone_device_register(psy->desc->name,
> - 0, 0, psy, &psy_tzd_ops, NULL, 0, 0);
> + psy->tzd = thermal_tripless_zone_device_register(psy->desc->name,
> + psy, &psy_tzd_ops, NULL);
> if (IS_ERR(psy->tzd))
> return PTR_ERR(psy->tzd);
> ret = thermal_zone_device_enable(psy->tzd);
> Index: linux-pm/drivers/thermal/armada_thermal.c
> ===================================================================
> --- linux-pm.orig/drivers/thermal/armada_thermal.c
> +++ linux-pm/drivers/thermal/armada_thermal.c
> @@ -876,8 +876,9 @@ static int armada_thermal_probe(struct p
> /* Wait the sensors to be valid */
> armada_wait_sensor_validity(priv);
>
> - tz = thermal_zone_device_register(priv->zone_name, 0, 0, priv,
> - &legacy_ops, NULL, 0, 0);
> + tz = thermal_tripless_zone_device_register(priv->zone_name,
> + priv, &legacy_ops,
> + NULL);
> if (IS_ERR(tz)) {
> dev_err(&pdev->dev,
> "Failed to register thermal zone device\n");
> Index: linux-pm/drivers/thermal/dove_thermal.c
> ===================================================================
> --- linux-pm.orig/drivers/thermal/dove_thermal.c
> +++ linux-pm/drivers/thermal/dove_thermal.c
> @@ -139,8 +139,8 @@ static int dove_thermal_probe(struct pla
> return ret;
> }
>
> - thermal = thermal_zone_device_register("dove_thermal", 0, 0,
> - priv, &ops, NULL, 0, 0);
> + thermal = thermal_tripless_zone_device_register("dove_thermal", priv,
> + &ops, NULL);
> if (IS_ERR(thermal)) {
> dev_err(&pdev->dev,
> "Failed to register thermal zone device\n");
> Index: linux-pm/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
> ===================================================================
> --- linux-pm.orig/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
> +++ linux-pm/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
> @@ -609,9 +609,9 @@ static int int3400_thermal_probe(struct
>
> evaluate_odvp(priv);
>
> - priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
> - priv, &int3400_thermal_ops,
> - &int3400_thermal_params, 0, 0);
> + priv->thermal = thermal_tripless_zone_device_register("INT3400 Thermal", priv,
> + &int3400_thermal_ops,
> + &int3400_thermal_params);
> if (IS_ERR(priv->thermal)) {
> result = PTR_ERR(priv->thermal);
> goto free_art_trt;
> Index: linux-pm/drivers/thermal/kirkwood_thermal.c
> ===================================================================
> --- linux-pm.orig/drivers/thermal/kirkwood_thermal.c
> +++ linux-pm/drivers/thermal/kirkwood_thermal.c
> @@ -71,8 +71,8 @@ static int kirkwood_thermal_probe(struct
> if (IS_ERR(priv->sensor))
> return PTR_ERR(priv->sensor);
>
> - thermal = thermal_zone_device_register("kirkwood_thermal", 0, 0,
> - priv, &ops, NULL, 0, 0);
> + thermal = thermal_tripless_zone_device_register("kirkwood_thermal",
> + priv, &ops, NULL);
> if (IS_ERR(thermal)) {
> dev_err(&pdev->dev,
> "Failed to register thermal zone device\n");
> Index: linux-pm/drivers/thermal/spear_thermal.c
> ===================================================================
> --- linux-pm.orig/drivers/thermal/spear_thermal.c
> +++ linux-pm/drivers/thermal/spear_thermal.c
> @@ -122,8 +122,8 @@ static int spear_thermal_probe(struct pl
> stdev->flags = val;
> writel_relaxed(stdev->flags, stdev->thermal_base);
>
> - spear_thermal = thermal_zone_device_register("spear_thermal", 0, 0,
> - stdev, &ops, NULL, 0, 0);
> + spear_thermal = thermal_tripless_zone_device_register("spear_thermal",
> + stdev, &ops, NULL);
> if (IS_ERR(spear_thermal)) {
> dev_err(&pdev->dev, "thermal zone device is NULL\n");
> ret = PTR_ERR(spear_thermal);
>
>
>