Commit 71ca46ee authored by Eduardo Valentin's avatar Eduardo Valentin
Browse files

thermal: convert tegra_thermal to use devm_thermal_zone_of_sensor_register 



This changes the driver to use the devm_ version
of thermal_zone_of_sensor_register and cleans
up the  local points and unregister calls.

Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Alexandre Courbot <gnurou@gmail.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-tegra@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent 2633ad19

drivers/thermal/tegra_soctherm.c

+9 −22
Original line number Original line Diff line number Diff line
@@ -168,7 +168,7 @@ struct tegra_soctherm { 
	struct clk *clock_soctherm;

	struct clk *clock_soctherm;

	void __iomem *regs;

	void __iomem *regs;





	struct thermal_zone_device *thermctl_tzs[4];

#define ZONE_NUMBER		4

};

};





struct tsensor_shared_calibration {

struct tsensor_shared_calibration {
@@ -342,7 +342,7 @@ static const struct thermctl_zone_desc t124_thermctl_temp_zones[] = { 
static int tegra_soctherm_probe(struct platform_device *pdev)

static int tegra_soctherm_probe(struct platform_device *pdev)

{

{

	struct tegra_soctherm *tegra;

	struct tegra_soctherm *tegra;

	struct thermal_zone_device *tz;

	struct thermal_zone_device *z;

	struct tsensor_shared_calibration shared_calib;

	struct tsensor_shared_calibration shared_calib;

	struct resource *res;

	struct resource *res;

	unsigned int i;

	unsigned int i;
@@ -408,36 +408,29 @@ static int tegra_soctherm_probe(struct platform_device *pdev) 




	/* Initialize thermctl sensors */

	/* Initialize thermctl sensors */





	for (i = 0; i < ARRAY_SIZE(tegra->thermctl_tzs); ++i) {

	for (i = 0; i < ZONE_NUMBER; ++i) {

		struct tegra_thermctl_zone *zone =

		struct tegra_thermctl_zone *zone =

			devm_kzalloc(&pdev->dev, sizeof(*zone), GFP_KERNEL);

			devm_kzalloc(&pdev->dev, sizeof(*zone), GFP_KERNEL);

		if (!zone) {

		if (!zone) {

			err = -ENOMEM;

			err = -ENOMEM;

			goto unregister_tzs;

			goto disable_clocks;

		}

		}





		zone->reg = tegra->regs + t124_thermctl_temp_zones[i].offset;

		zone->reg = tegra->regs + t124_thermctl_temp_zones[i].offset;

		zone->shift = t124_thermctl_temp_zones[i].shift;

		zone->shift = t124_thermctl_temp_zones[i].shift;





		tz = thermal_zone_of_sensor_register(&pdev->dev, i, zone,

		z = devm_thermal_zone_of_sensor_register(&pdev->dev, i, zone,

							 &tegra_of_thermal_ops);

							 &tegra_of_thermal_ops);

		if (IS_ERR(tz)) {

		if (IS_ERR(z)) {

			err = PTR_ERR(tz);

			err = PTR_ERR(z);

			dev_err(&pdev->dev, "failed to register sensor: %d\n",

			dev_err(&pdev->dev, "failed to register sensor: %d\n",

				err);

				err);

			goto unregister_tzs;

			goto disable_clocks;

		}

		}



		tegra->thermctl_tzs[i] = tz;

	}

	}





	return 0;

	return 0;





unregister_tzs:

	while (i--)

		thermal_zone_of_sensor_unregister(&pdev->dev,

						  tegra->thermctl_tzs[i]);



disable_clocks:

disable_clocks:

	clk_disable_unprepare(tegra->clock_tsensor);

	clk_disable_unprepare(tegra->clock_tsensor);

	clk_disable_unprepare(tegra->clock_soctherm);

	clk_disable_unprepare(tegra->clock_soctherm);
@@ -448,12 +441,6 @@ static int tegra_soctherm_probe(struct platform_device *pdev) 
static int tegra_soctherm_remove(struct platform_device *pdev)

static int tegra_soctherm_remove(struct platform_device *pdev)

{

{

	struct tegra_soctherm *tegra = platform_get_drvdata(pdev);

	struct tegra_soctherm *tegra = platform_get_drvdata(pdev);

	unsigned int i;



	for (i = 0; i < ARRAY_SIZE(tegra->thermctl_tzs); ++i) {

		thermal_zone_of_sensor_unregister(&pdev->dev,

						  tegra->thermctl_tzs[i]);

	}





	clk_disable_unprepare(tegra->clock_tsensor);

	clk_disable_unprepare(tegra->clock_tsensor);

	clk_disable_unprepare(tegra->clock_soctherm);

	clk_disable_unprepare(tegra->clock_soctherm);