diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2012-10-02 23:51:09 -0700 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2012-11-07 11:35:46 +0800 |
| commit | 4e8e2f644e11a7d65381967a916ae7cac76a735b (patch) | |
| tree | f35f7f4e8971f611ff199d815c887fb28b0a2acb /drivers/thermal | |
| parent | e15cb144939c84947b4fbcf191cda59d71cd0b34 (diff) | |
| download | linux-4e8e2f644e11a7d65381967a916ae7cac76a735b.tar.bz2 | |
thermal: rcar_thermal: remove explicitly used devm_kfree/iounap()
devm_kfree and devm_iounmap should not have to be explicitly used
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/rcar_thermal.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c index 762f6373d50c..81dce23828f3 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; } |