Hi,
Could you please also apply this patch?
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
On Friday, October 04, 2013 02:38:25 PM Bartlomiej Zolnierkiewicz wrote:
> There is little sense in having separate config option for
> registering EXYNOS TMU driver with the core thermal framework.
> Fix it by integrating EXYNOS_THERMAL_CORE config option with
> EXYNOS_THERMAL one.
>
> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx>
> Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
> ---
> drivers/thermal/samsung/Kconfig | 14 +++-----------
> drivers/thermal/samsung/Makefile | 2 +-
> drivers/thermal/samsung/exynos_thermal_common.h | 12 ------------
> 3 files changed, 4 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/thermal/samsung/Kconfig b/drivers/thermal/samsung/Kconfig
> index f760389..04eabee 100644
> --- a/drivers/thermal/samsung/Kconfig
> +++ b/drivers/thermal/samsung/Kconfig
> @@ -5,14 +5,6 @@ config EXYNOS_THERMAL
> If you say yes here you get support for the TMU (Thermal Management
> Unit) driver for SAMSUNG EXYNOS series of SoCs. This driver initialises
> the TMU, reports temperature and handles cooling action if defined.
> - This driver uses the Exynos core thermal APIs and TMU configuration
> - data from the supported SoCs.
> -
> -config EXYNOS_THERMAL_CORE
> - bool "Core thermal framework support for EXYNOS SOCs"
> - depends on EXYNOS_THERMAL
> - help
> - If you say yes here you get support for EXYNOS TMU
> - (Thermal Management Unit) common registration/unregistration
> - functions to the core thermal layer and also to use the generic
> - CPU cooling APIs.
> + This driver uses the Exynos core thermal APIs, TMU configuration data
> + from the supported SoCs, common registration/unregistration functions
> + to the core thermal layer and also the generic CPU cooling APIs.
> diff --git a/drivers/thermal/samsung/Makefile b/drivers/thermal/samsung/Makefile
> index c09d830..a829107 100644
> --- a/drivers/thermal/samsung/Makefile
> +++ b/drivers/thermal/samsung/Makefile
> @@ -4,4 +4,4 @@
> obj-$(CONFIG_EXYNOS_THERMAL) += exynos_thermal.o
> exynos_thermal-y := exynos_tmu.o
> exynos_thermal-y += exynos_tmu_data.o
> -exynos_thermal-$(CONFIG_EXYNOS_THERMAL_CORE) += exynos_thermal_common.o
> +exynos_thermal-y += exynos_thermal_common.o
> diff --git a/drivers/thermal/samsung/exynos_thermal_common.h b/drivers/thermal/samsung/exynos_thermal_common.h
> index 3eb2ed9..8681679 100644
> --- a/drivers/thermal/samsung/exynos_thermal_common.h
> +++ b/drivers/thermal/samsung/exynos_thermal_common.h
> @@ -88,20 +88,8 @@ struct thermal_sensor_conf {
> struct device *dev;
> };
>
> -/*Functions used exynos based thermal sensor driver*/
> -#ifdef CONFIG_EXYNOS_THERMAL_CORE
> void exynos_unregister_thermal(struct thermal_sensor_conf *sensor_conf);
> int exynos_register_thermal(struct thermal_sensor_conf *sensor_conf);
> void exynos_report_trigger(struct thermal_sensor_conf *sensor_conf);
> -#else
> -static inline void
> -exynos_unregister_thermal(struct thermal_sensor_conf *sensor_conf) { return; }
>
> -static inline int
> -exynos_register_thermal(struct thermal_sensor_conf *sensor_conf) { return 0; }
> -
> -static inline void
> -exynos_report_trigger(struct thermal_sensor_conf *sensor_conf) { return; }
> -
> -#endif /* CONFIG_EXYNOS_THERMAL_CORE */
> #endif /* _EXYNOS_THERMAL_COMMON_H */
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
