openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

thermal: exynos: always check for critical trip points existence 

* Check for critical trip point existence in exynos_tmu_initialize()
  so it is checked on all SoCs (except Exynos5433 for now).

* Use dev_err() instead of pr_err().

* Fix dev_err() to reference "device tree" not "of-thermal.c".

* Remove no longer needed check from exynos4412_tmu_initialize().

Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2018-04-26 13:51:18 +02:00 committed by Eduardo Valentin
parent 75e0f10077
commit 8f1c404b21
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/thermal/samsung/exynos_tmu.c
View File

@ -331,7 +331,7 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
struct thermal_zone_device *tzd = data->tzd;
const struct thermal_trip * const trips =
of_thermal_get_trip_points(tzd);
int ret;
int ret = 0, temp;
if (!trips) {
dev_err(&pdev->dev,
@ -339,6 +339,14 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
return -ENODEV;
}
if (data->soc != SOC_ARCH_EXYNOS5433) /* FIXME */
ret = tzd->ops->get_crit_temp(tzd, &temp);
if (ret) {
dev_err(&pdev->dev,
"No CRITICAL trip point defined in device tree!\n");
goto out;
}
if (of_thermal_get_ntrips(tzd) > data->ntrip) {
dev_info(&pdev->dev,
"More trip points than supported by this TMU.\n");
@ -356,7 +364,7 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
mutex_unlock(&data->lock);
if (!IS_ERR(data->clk_sec))
clk_disable(data->clk_sec);
out:
return ret;
}
@ -480,13 +488,6 @@ static int exynos4412_tmu_initialize(struct platform_device *pdev)
}
}
if (i == of_thermal_get_ntrips(data->tzd)) {
pr_err("%s: No CRITICAL trip point defined at of-thermal.c!\n",
__func__);
ret = -EINVAL;
goto out;
}
threshold_code = temp_to_code(data, crit_temp / MCELSIUS);
/* 1-4 level to be assigned in th0 reg */
rising_threshold &= ~(0xff << 8 * i);