Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03b79bda authored by Julia Lawall's avatar Julia Lawall Committed by Zhang Rui
Browse files

drivers/thermal/spear_thermal.c: use devm_clk_get 



devm_clk_get allocates a resource that is released when a driver detaches.
This patch uses devm_clk_get for data that is allocated in the probe
function of a platform device and is only released in the remove function.

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent d2a73e22

drivers/thermal/spear_thermal.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -131,7 +131,7 @@ static int spear_thermal_probe(struct platform_device *pdev) 
		return -ENOMEM;

		return -ENOMEM;

	}

	}





	stdev->clk = clk_get(&pdev->dev, NULL);

	stdev->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(stdev->clk)) {

	if (IS_ERR(stdev->clk)) {

		dev_err(&pdev->dev, "Can't get clock\n");

		dev_err(&pdev->dev, "Can't get clock\n");

		return PTR_ERR(stdev->clk);

		return PTR_ERR(stdev->clk);
@@ -140,7 +140,7 @@ static int spear_thermal_probe(struct platform_device *pdev) 
	ret = clk_enable(stdev->clk);

	ret = clk_enable(stdev->clk);

	if (ret) {

	if (ret) {

		dev_err(&pdev->dev, "Can't enable clock\n");

		dev_err(&pdev->dev, "Can't enable clock\n");

		goto put_clk;

		return ret;

	}

	}





	stdev->flags = val;

	stdev->flags = val;
@@ -163,8 +163,6 @@ static int spear_thermal_probe(struct platform_device *pdev) 




disable_clk:

disable_clk:

	clk_disable(stdev->clk);

	clk_disable(stdev->clk);

put_clk:

	clk_put(stdev->clk);





	return ret;

	return ret;

}

}
@@ -183,7 +181,6 @@ static int spear_thermal_exit(struct platform_device *pdev) 
	writel_relaxed(actual_mask & ~stdev->flags, stdev->thermal_base);

	writel_relaxed(actual_mask & ~stdev->flags, stdev->thermal_base);





	clk_disable(stdev->clk);

	clk_disable(stdev->clk);

	clk_put(stdev->clk);





	return 0;

	return 0;

}

}