[PATCH] thermal: rcar_thermal: remove explicitly used devm_kfree/iounap()

[Kuninori Morimoto]

devm_kfree and devm_iounmap should not have to be explicitly used

Signed-off-by: Kuninori Morimoto <kuninori.morimoto...@renesas.com>
---
This patch is based on Devendra's
[PATCH] thermal: solve compilation errors in rcar_thermal

 drivers/thermal/rcar_thermal.c |   18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
index 762f637..81dce23 100644
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
@@ -185,7 +185,6 @@ static int rcar_thermal_probe(struct platform_device *pdev)
        struct thermal_zone_device *zone;
        struct rcar_thermal_priv *priv;
        struct resource *res;
-       int ret;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!res) {
@@ -206,16 +205,14 @@ static int rcar_thermal_probe(struct platform_device 
*pdev)
                                          res->start, resource_size(res));
        if (!priv->base) {
                dev_err(&pdev->dev, "Unable to ioremap thermal register\n");
-               ret = -ENOMEM;
-               goto error_free_priv;
+               return -ENOMEM;
        }
 
        zone = thermal_zone_device_register("rcar_thermal", 0, 0, priv,
                                    &rcar_thermal_zone_ops, NULL, 0, 0);
        if (IS_ERR(zone)) {
                dev_err(&pdev->dev, "thermal zone device is NULL\n");
-               ret = PTR_ERR(zone);
-               goto error_iounmap;
+               return PTR_ERR(zone);
        }
 
        platform_set_drvdata(pdev, zone);
@@ -223,26 +220,15 @@ static int rcar_thermal_probe(struct platform_device 
*pdev)
        dev_info(&pdev->dev, "proved\n");
 
        return 0;
-
-error_iounmap:
-       devm_iounmap(&pdev->dev, priv->base);
-error_free_priv:
-       devm_kfree(&pdev->dev, priv);
-
-       return ret;
 }
 
 static int rcar_thermal_remove(struct platform_device *pdev)
 {
        struct thermal_zone_device *zone = platform_get_drvdata(pdev);
-       struct rcar_thermal_priv *priv = zone->devdata;
 
        thermal_zone_device_unregister(zone);
        platform_set_drvdata(pdev, NULL);
 
-       devm_iounmap(&pdev->dev, priv->base);
-       devm_kfree(&pdev->dev, priv);
-
        return 0;
 }
 
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/