summaryrefslogtreecommitdiffstats
path: root/drivers/thermal
diff options
context:
space:
mode:
authorKevin Wangtao <kevin.wangtao@linaro.org>2017-10-19 19:05:56 +0200
committerEduardo Valentin <edubezval@gmail.com>2017-10-31 19:32:17 -0700
commit943c0f6abfb6010065b80943356975885a33233c (patch)
tree35368fe70c17db3f7c6eed2001da450668f3a495 /drivers/thermal
parentcc1ab38d2b2ad3290426c2234cf83e7a323554c7 (diff)
downloadlinux-943c0f6abfb6010065b80943356975885a33233c.tar.bz2
thermal/drivers/hisi: Move the clk setup in the corresponding functions
The sensor's clock is enabled and disabled outside of the probe and disable function. Moving the corresponding action in the hisi_thermal_setup() and hisi_thermal_disable_sensor(), factors out some lines of code and makes the code more symmetric. Signed-off-by: Kevin Wangtao <kevin.wangtao@linaro.org> Tested-by: Daniel Lezcano <daniel.lezcano@linaro.org> # hikey6220 Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Diffstat (limited to 'drivers/thermal')
-rw-r--r--drivers/thermal/hisi_thermal.c29
1 files changed, 9 insertions, 20 deletions
diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
index 90e91fedc76d..373bb6d094a1 100644
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -203,6 +203,8 @@ static void hisi_thermal_disable_sensor(struct hisi_thermal_data *data)
hisi_thermal_enable(data->regs, 0);
hisi_thermal_alarm_enable(data->regs, 0);
hisi_thermal_reset_enable(data->regs, 0);
+
+ clk_disable_unprepare(data->clk);
}
static int hisi_thermal_get_temp(void *__data, int *temp)
@@ -297,9 +299,13 @@ static void hisi_thermal_toggle_sensor(struct hisi_thermal_sensor *sensor,
static int hisi_thermal_setup(struct hisi_thermal_data *data)
{
- struct hisi_thermal_sensor *sensor;
+ struct hisi_thermal_sensor *sensor = &data->sensor;
+ int ret;
- sensor = &data->sensor;
+ /* enable clock for tsensor */
+ ret = clk_prepare_enable(data->clk);
+ if (ret)
+ return ret;
/* disable module firstly */
hisi_thermal_reset_enable(data->regs, 0);
@@ -363,13 +369,6 @@ static int hisi_thermal_probe(struct platform_device *pdev)
return ret;
}
- /* enable clock for thermal */
- ret = clk_prepare_enable(data->clk);
- if (ret) {
- dev_err(&pdev->dev, "failed to enable thermal clk: %d\n", ret);
- return ret;
- }
-
ret = hisi_thermal_register_sensor(pdev, data,
&data->sensor,
HISI_DEFAULT_SENSOR);
@@ -405,7 +404,6 @@ static int hisi_thermal_remove(struct platform_device *pdev)
hisi_thermal_toggle_sensor(sensor, false);
hisi_thermal_disable_sensor(data);
- clk_disable_unprepare(data->clk);
return 0;
}
@@ -417,23 +415,14 @@ static int hisi_thermal_suspend(struct device *dev)
hisi_thermal_disable_sensor(data);
- clk_disable_unprepare(data->clk);
-
return 0;
}
static int hisi_thermal_resume(struct device *dev)
{
struct hisi_thermal_data *data = dev_get_drvdata(dev);
- int ret;
- ret = clk_prepare_enable(data->clk);
- if (ret)
- return ret;
-
- hisi_thermal_setup(data);
-
- return 0;
+ return hisi_thermal_setup(data);
}
#endif