Skip to contentSkip to conversation

thermal: rcar_thermal: propagate return value of thermal_zone_device_register

PATCH Applied Devendra Naga 2 participants 4 messages Mar 4, 2013 – Mar 11, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 thermal: rcar_thermal: propagate return value of thermal_zone_device_register

thermal_zone_device_register returns a value contained in the pointer itself use PTR_ERR to obtain the address and return it at the end.

---
 drivers/thermal/rcar_thermal.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/thermal/rcar_thermal.c +3 -1
index 28f0919..f1726c9 100644
@@ -363,6 +363,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
 	struct resource *res, *irq;
 	int mres = 0;
 	int i;
+	int ret = -ENODEV;
 	int idle = IDLE_INTERVAL;
 
 	common = devm_kzalloc(dev, sizeof(*common), GFP_KERNEL);
@@ -441,6 +442,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
 						idle);
 		if (IS_ERR(priv->zone)) {
 			dev_err(dev, "can't register thermal zone\n");
+			ret = PTR_ERR(priv->zone);
 			goto error_unregister;
 		}
 
@@ -460,7 +462,7 @@ error_unregister:
 	rcar_thermal_for_each_priv(priv, common)
 		thermal_zone_device_unregister(priv->zone);
 
-	return -ENODEV;
+	return ret;
 }
 
 static int rcar_thermal_remove(struct platform_device *pdev)
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 2/2 thermal: exynos_thermal: return a proper error code while thermal_zone_device_register fail.

we are returning EINVAL while the thermal_zone_device_register function fail. instead we can use the return value from the thermal_zone_device_register by using PTR_ERR.

---
 drivers/thermal/exynos_thermal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/exynos_thermal.c +1 -1
index e04ebd8..46568c0 100644
@@ -476,7 +476,7 @@ static int exynos_register_thermal(struct thermal_sensor_conf *sensor_conf)
 
 	if (IS_ERR(th_zone->therm_dev)) {
 		pr_err("Failed to register thermal zone device\n");
-		ret = -EINVAL;
+		ret = PTR_ERR(th_zone->therm_dev);
 		goto err_unregister;
 	}
 	th_zone->mode = THERMAL_DEVICE_ENABLED;
Signature · 1 line
1.8.1.2
reviewer Applied
#2 lore raw

Re: [PATCH 2/2] thermal: exynos_thermal: return a proper error code while thermal_zone_device_register fail.

Quoted 5 lines · Devendra Naga

we are returning EINVAL while the thermal_zone_device_register function fail. instead we can use the return value from the thermal_zone_device_register by using PTR_ERR.

applied to thermal -next.

thanks,
rui

Quoted 17 lines
---
 drivers/thermal/exynos_thermal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/exynos_thermal.c +1 -1
index e04ebd8..46568c0 100644
@@ -476,7 +476,7 @@ static int exynos_register_thermal(struct thermal_sensor_conf *sensor_conf)
 
 	if (IS_ERR(th_zone->therm_dev)) {
 		pr_err("Failed to register thermal zone device\n");
-		ret = -EINVAL;
+		ret = PTR_ERR(th_zone->therm_dev);
 		goto err_unregister;
 	}
 	th_zone->mode = THERMAL_DEVICE_ENABLED;
reviewer Applied
#3 lore raw
In reply to Devendra Naga
Quoted 4 lines · Devendra Naga

thermal_zone_device_register returns a value contained in the pointer itself use PTR_ERR to obtain the address and return it at the end.

Applied to thermal -next.

thanks,
rui

Quoted 33 lines
---
 drivers/thermal/rcar_thermal.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/thermal/rcar_thermal.c +3 -1
index 28f0919..f1726c9 100644
@@ -363,6 +363,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
 	struct resource *res, *irq;
 	int mres = 0;
 	int i;
+	int ret = -ENODEV;
 	int idle = IDLE_INTERVAL;
 
 	common = devm_kzalloc(dev, sizeof(*common), GFP_KERNEL);
@@ -441,6 +442,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
 						idle);
 		if (IS_ERR(priv->zone)) {
 			dev_err(dev, "can't register thermal zone\n");
+			ret = PTR_ERR(priv->zone);
 			goto error_unregister;
 		}
 
@@ -460,7 +462,7 @@ error_unregister:
 	rcar_thermal_for_each_priv(priv, common)
 		thermal_zone_device_unregister(priv->zone);
 
-	return -ENODEV;
+	return ret;
 }
 
 static int rcar_thermal_remove(struct platform_device *pdev)