thermal: Use thermal_tripless_zone_device_register()
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 <rafael.j.wysocki@intel.com> Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
This commit is contained in:
@@ -1309,8 +1309,8 @@ static int psy_register_thermal(struct power_supply *psy)
|
|||||||
struct thermal_zone_params tzp = {
|
struct thermal_zone_params tzp = {
|
||||||
.no_hwmon = IS_ENABLED(CONFIG_POWER_SUPPLY_HWMON)
|
.no_hwmon = IS_ENABLED(CONFIG_POWER_SUPPLY_HWMON)
|
||||||
};
|
};
|
||||||
psy->tzd = thermal_zone_device_register(psy->desc->name,
|
psy->tzd = thermal_tripless_zone_device_register(psy->desc->name,
|
||||||
0, 0, psy, &psy_tzd_ops, &tzp, 0, 0);
|
psy, &psy_tzd_ops, &tzp);
|
||||||
if (IS_ERR(psy->tzd))
|
if (IS_ERR(psy->tzd))
|
||||||
return PTR_ERR(psy->tzd);
|
return PTR_ERR(psy->tzd);
|
||||||
ret = thermal_zone_device_enable(psy->tzd);
|
ret = thermal_zone_device_enable(psy->tzd);
|
||||||
|
|||||||
@@ -876,8 +876,9 @@ static int armada_thermal_probe(struct platform_device *pdev)
|
|||||||
/* Wait the sensors to be valid */
|
/* Wait the sensors to be valid */
|
||||||
armada_wait_sensor_validity(priv);
|
armada_wait_sensor_validity(priv);
|
||||||
|
|
||||||
tz = thermal_zone_device_register(priv->zone_name, 0, 0, priv,
|
tz = thermal_tripless_zone_device_register(priv->zone_name,
|
||||||
&legacy_ops, NULL, 0, 0);
|
priv, &legacy_ops,
|
||||||
|
NULL);
|
||||||
if (IS_ERR(tz)) {
|
if (IS_ERR(tz)) {
|
||||||
dev_err(&pdev->dev,
|
dev_err(&pdev->dev,
|
||||||
"Failed to register thermal zone device\n");
|
"Failed to register thermal zone device\n");
|
||||||
|
|||||||
@@ -139,8 +139,8 @@ static int dove_thermal_probe(struct platform_device *pdev)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
thermal = thermal_zone_device_register("dove_thermal", 0, 0,
|
thermal = thermal_tripless_zone_device_register("dove_thermal", priv,
|
||||||
priv, &ops, NULL, 0, 0);
|
&ops, NULL);
|
||||||
if (IS_ERR(thermal)) {
|
if (IS_ERR(thermal)) {
|
||||||
dev_err(&pdev->dev,
|
dev_err(&pdev->dev,
|
||||||
"Failed to register thermal zone device\n");
|
"Failed to register thermal zone device\n");
|
||||||
|
|||||||
@@ -609,9 +609,9 @@ static int int3400_thermal_probe(struct platform_device *pdev)
|
|||||||
|
|
||||||
evaluate_odvp(priv);
|
evaluate_odvp(priv);
|
||||||
|
|
||||||
priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
|
priv->thermal = thermal_tripless_zone_device_register("INT3400 Thermal", priv,
|
||||||
priv, &int3400_thermal_ops,
|
&int3400_thermal_ops,
|
||||||
&int3400_thermal_params, 0, 0);
|
&int3400_thermal_params);
|
||||||
if (IS_ERR(priv->thermal)) {
|
if (IS_ERR(priv->thermal)) {
|
||||||
result = PTR_ERR(priv->thermal);
|
result = PTR_ERR(priv->thermal);
|
||||||
goto free_art_trt;
|
goto free_art_trt;
|
||||||
|
|||||||
@@ -71,8 +71,8 @@ static int kirkwood_thermal_probe(struct platform_device *pdev)
|
|||||||
if (IS_ERR(priv->sensor))
|
if (IS_ERR(priv->sensor))
|
||||||
return PTR_ERR(priv->sensor);
|
return PTR_ERR(priv->sensor);
|
||||||
|
|
||||||
thermal = thermal_zone_device_register("kirkwood_thermal", 0, 0,
|
thermal = thermal_tripless_zone_device_register("kirkwood_thermal",
|
||||||
priv, &ops, NULL, 0, 0);
|
priv, &ops, NULL);
|
||||||
if (IS_ERR(thermal)) {
|
if (IS_ERR(thermal)) {
|
||||||
dev_err(&pdev->dev,
|
dev_err(&pdev->dev,
|
||||||
"Failed to register thermal zone device\n");
|
"Failed to register thermal zone device\n");
|
||||||
|
|||||||
@@ -122,8 +122,8 @@ static int spear_thermal_probe(struct platform_device *pdev)
|
|||||||
stdev->flags = val;
|
stdev->flags = val;
|
||||||
writel_relaxed(stdev->flags, stdev->thermal_base);
|
writel_relaxed(stdev->flags, stdev->thermal_base);
|
||||||
|
|
||||||
spear_thermal = thermal_zone_device_register("spear_thermal", 0, 0,
|
spear_thermal = thermal_tripless_zone_device_register("spear_thermal",
|
||||||
stdev, &ops, NULL, 0, 0);
|
stdev, &ops, NULL);
|
||||||
if (IS_ERR(spear_thermal)) {
|
if (IS_ERR(spear_thermal)) {
|
||||||
dev_err(&pdev->dev, "thermal zone device is NULL\n");
|
dev_err(&pdev->dev, "thermal zone device is NULL\n");
|
||||||
ret = PTR_ERR(spear_thermal);
|
ret = PTR_ERR(spear_thermal);
|
||||||
|
|||||||
Reference in New Issue
Block a user