Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

thermal: rcar_thermal: remove explicitly used devm_kfree/iounap()

Browse source 
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>
This commit is contained in:
Kuninori Morimoto 2012-10-02 23:51:09 -07:00 committed by Zhang Rui
parent e15cb14493
commit 4e8e2f644e
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/thermal/rcar_thermal.c
View file

@ -185,7 +185,6 @@ static int rcar_thermal_probe(struct platform_device *pdev)
struct thermal_zone_device *zone; struct thermal_zone_device *zone;
struct rcar_thermal_priv *priv; struct rcar_thermal_priv *priv;
struct resource *res; struct resource *res;
int ret;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) { if (!res) {
@ -206,16 +205,14 @@ static int rcar_thermal_probe(struct platform_device *pdev)
res->start, resource_size(res)); res->start, resource_size(res));
if (!priv->base) { if (!priv->base) {
dev_err(&pdev->dev, "Unable to ioremap thermal register\n"); dev_err(&pdev->dev, "Unable to ioremap thermal register\n");
ret = -ENOMEM; return -ENOMEM;
goto error_free_priv;
} }
zone = thermal_zone_device_register("rcar_thermal", 0, 0, priv, zone = thermal_zone_device_register("rcar_thermal", 0, 0, priv,
&rcar_thermal_zone_ops, NULL, 0, 0); &rcar_thermal_zone_ops, NULL, 0, 0);
if (IS_ERR(zone)) { if (IS_ERR(zone)) {
dev_err(&pdev->dev, "thermal zone device is NULL\n"); dev_err(&pdev->dev, "thermal zone device is NULL\n");
ret = PTR_ERR(zone); return PTR_ERR(zone);
goto error_iounmap;
} }
platform_set_drvdata(pdev, 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"); dev_info(&pdev->dev, "proved\n");
return 0; 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) static int rcar_thermal_remove(struct platform_device *pdev)
{ {
struct thermal_zone_device *zone = platform_get_drvdata(pdev); struct thermal_zone_device *zone = platform_get_drvdata(pdev);
struct rcar_thermal_priv *priv = zone->devdata;
thermal_zone_device_unregister(zone); thermal_zone_device_unregister(zone);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
devm_iounmap(&pdev->dev, priv->base);
devm_kfree(&pdev->dev, priv);
return 0; return 0;
} }