From: Sascha Hauer <s.hauer@pengutronix.de> To: linux-pm@vger.kernel.org Cc: Zhang Rui <rui.zhang@intel.com>, Eduardo Valentin <edubezval@gmail.com>, linux-kernel@vger.kernel.org, Stephen Warren <swarren@wwwdotorg.org>, Mikko Perttunen <mikko.perttunen@kapsi.fi>, kernel@pengutronix.de, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Sascha Hauer <s.hauer@pengutronix.de> Subject: [PATCH 07/13] thermal: of: streamline .get_temp callbacks Date: Thu, 26 Mar 2015 16:53:54 +0100 [thread overview] Message-ID: <1427385240-6086-8-git-send-email-s.hauer@pengutronix.de> (raw) In-Reply-To: <1427385240-6086-1-git-send-email-s.hauer@pengutronix.de> In the thermal framework it was decided that temperatures can't be negative, so let the .get_temp callback in struct thermal_zone_of_device_ops take an unsigned long pointer for the temperature like the .get_temp callback in struct thermal_zone_device_ops does. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- drivers/hwmon/lm75.c | 2 +- drivers/hwmon/ntc_thermistor.c | 2 +- drivers/hwmon/tmp102.c | 2 +- drivers/input/touchscreen/sun4i-ts.c | 2 +- drivers/thermal/rockchip_thermal.c | 2 +- drivers/thermal/samsung/exynos_tmu.c | 2 +- drivers/thermal/tegra_soctherm.c | 2 +- drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 2 +- include/linux/thermal.h | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c index fe41d5a..9df3ca3 100644 --- a/drivers/hwmon/lm75.c +++ b/drivers/hwmon/lm75.c @@ -104,7 +104,7 @@ static inline long lm75_reg_to_mc(s16 temp, u8 resolution) /* sysfs attributes for hwmon */ -static int lm75_read_temp(void *dev, long *temp) +static int lm75_read_temp(void *dev, unsigned long *temp) { struct lm75_data *data = lm75_update_device(dev); diff --git a/drivers/hwmon/ntc_thermistor.c b/drivers/hwmon/ntc_thermistor.c index 112e4d4..12cb333 100644 --- a/drivers/hwmon/ntc_thermistor.c +++ b/drivers/hwmon/ntc_thermistor.c @@ -430,7 +430,7 @@ static int ntc_thermistor_get_ohm(struct ntc_data *data) return -EINVAL; } -static int ntc_read_temp(void *dev, long *temp) +static int ntc_read_temp(void *dev, unsigned long *temp) { struct ntc_data *data = dev_get_drvdata(dev); int ohm; diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c index 9da2735..25bd72b 100644 --- a/drivers/hwmon/tmp102.c +++ b/drivers/hwmon/tmp102.c @@ -98,7 +98,7 @@ static struct tmp102 *tmp102_update_device(struct device *dev) return tmp102; } -static int tmp102_read_temp(void *dev, long *temp) +static int tmp102_read_temp(void *dev, unsigned long *temp) { struct tmp102 *tmp102 = tmp102_update_device(dev); diff --git a/drivers/input/touchscreen/sun4i-ts.c b/drivers/input/touchscreen/sun4i-ts.c index b93a28b..26a7cf5 100644 --- a/drivers/input/touchscreen/sun4i-ts.c +++ b/drivers/input/touchscreen/sun4i-ts.c @@ -198,7 +198,7 @@ static int sun4i_get_temp(const struct sun4i_ts_data *ts, long *temp) return 0; } -static int sun4i_get_tz_temp(void *data, long *temp) +static int sun4i_get_tz_temp(void *data, unsigned long *temp) { return sun4i_get_temp(data, temp); } diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c index 3aa46ac..67dfc67 100644 --- a/drivers/thermal/rockchip_thermal.c +++ b/drivers/thermal/rockchip_thermal.c @@ -366,7 +366,7 @@ static irqreturn_t rockchip_thermal_alarm_irq_thread(int irq, void *dev) return IRQ_HANDLED; } -static int rockchip_thermal_get_temp(void *_sensor, long *out_temp) +static int rockchip_thermal_get_temp(void *_sensor, unsigned long *out_temp) { struct rockchip_thermal_sensor *sensor = _sensor; struct rockchip_thermal_data *thermal = sensor->thermal; diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c index 1d30b09..5f721f2 100644 --- a/drivers/thermal/samsung/exynos_tmu.c +++ b/drivers/thermal/samsung/exynos_tmu.c @@ -713,7 +713,7 @@ static void exynos7_tmu_control(struct platform_device *pdev, bool on) writel(con, data->base + EXYNOS_TMU_REG_CONTROL); } -static int exynos_get_temp(void *p, long *temp) +static int exynos_get_temp(void *p, unsigned long *temp) { struct exynos_tmu_data *data = p; diff --git a/drivers/thermal/tegra_soctherm.c b/drivers/thermal/tegra_soctherm.c index 9197fc0..1c4e455 100644 --- a/drivers/thermal/tegra_soctherm.c +++ b/drivers/thermal/tegra_soctherm.c @@ -306,7 +306,7 @@ static long translate_temp(u16 val) return t; } -static int tegra_thermctl_get_temp(void *data, long *out_temp) +static int tegra_thermctl_get_temp(void *data, unsigned long *out_temp) { struct tegra_thermctl_zone *zone = data; u32 val; diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c index 7f8e5f3..f480a01 100644 --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c @@ -76,7 +76,7 @@ static inline int ti_thermal_hotspot_temperature(int t, int s, int c) /* thermal zone ops */ /* Get temperature callback function for thermal zone*/ -static inline int __ti_thermal_get_temp(void *devdata, long *temp) +static inline int __ti_thermal_get_temp(void *devdata, unsigned long *temp) { struct thermal_zone_device *pcb_tz = NULL; struct ti_thermal_data *data = devdata; diff --git a/include/linux/thermal.h b/include/linux/thermal.h index ba2e29a..2f77091 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -272,7 +272,7 @@ struct thermal_genl_event { * temperature. */ struct thermal_zone_of_device_ops { - int (*get_temp)(void *, long *); + int (*get_temp)(void *, unsigned long *); int (*get_trend)(void *, int trend, enum thermal_trend *); int (*set_emul_temp)(void *, unsigned long); }; -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: s.hauer@pengutronix.de (Sascha Hauer) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 07/13] thermal: of: streamline .get_temp callbacks Date: Thu, 26 Mar 2015 16:53:54 +0100 [thread overview] Message-ID: <1427385240-6086-8-git-send-email-s.hauer@pengutronix.de> (raw) In-Reply-To: <1427385240-6086-1-git-send-email-s.hauer@pengutronix.de> In the thermal framework it was decided that temperatures can't be negative, so let the .get_temp callback in struct thermal_zone_of_device_ops take an unsigned long pointer for the temperature like the .get_temp callback in struct thermal_zone_device_ops does. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- drivers/hwmon/lm75.c | 2 +- drivers/hwmon/ntc_thermistor.c | 2 +- drivers/hwmon/tmp102.c | 2 +- drivers/input/touchscreen/sun4i-ts.c | 2 +- drivers/thermal/rockchip_thermal.c | 2 +- drivers/thermal/samsung/exynos_tmu.c | 2 +- drivers/thermal/tegra_soctherm.c | 2 +- drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 2 +- include/linux/thermal.h | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c index fe41d5a..9df3ca3 100644 --- a/drivers/hwmon/lm75.c +++ b/drivers/hwmon/lm75.c @@ -104,7 +104,7 @@ static inline long lm75_reg_to_mc(s16 temp, u8 resolution) /* sysfs attributes for hwmon */ -static int lm75_read_temp(void *dev, long *temp) +static int lm75_read_temp(void *dev, unsigned long *temp) { struct lm75_data *data = lm75_update_device(dev); diff --git a/drivers/hwmon/ntc_thermistor.c b/drivers/hwmon/ntc_thermistor.c index 112e4d4..12cb333 100644 --- a/drivers/hwmon/ntc_thermistor.c +++ b/drivers/hwmon/ntc_thermistor.c @@ -430,7 +430,7 @@ static int ntc_thermistor_get_ohm(struct ntc_data *data) return -EINVAL; } -static int ntc_read_temp(void *dev, long *temp) +static int ntc_read_temp(void *dev, unsigned long *temp) { struct ntc_data *data = dev_get_drvdata(dev); int ohm; diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c index 9da2735..25bd72b 100644 --- a/drivers/hwmon/tmp102.c +++ b/drivers/hwmon/tmp102.c @@ -98,7 +98,7 @@ static struct tmp102 *tmp102_update_device(struct device *dev) return tmp102; } -static int tmp102_read_temp(void *dev, long *temp) +static int tmp102_read_temp(void *dev, unsigned long *temp) { struct tmp102 *tmp102 = tmp102_update_device(dev); diff --git a/drivers/input/touchscreen/sun4i-ts.c b/drivers/input/touchscreen/sun4i-ts.c index b93a28b..26a7cf5 100644 --- a/drivers/input/touchscreen/sun4i-ts.c +++ b/drivers/input/touchscreen/sun4i-ts.c @@ -198,7 +198,7 @@ static int sun4i_get_temp(const struct sun4i_ts_data *ts, long *temp) return 0; } -static int sun4i_get_tz_temp(void *data, long *temp) +static int sun4i_get_tz_temp(void *data, unsigned long *temp) { return sun4i_get_temp(data, temp); } diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c index 3aa46ac..67dfc67 100644 --- a/drivers/thermal/rockchip_thermal.c +++ b/drivers/thermal/rockchip_thermal.c @@ -366,7 +366,7 @@ static irqreturn_t rockchip_thermal_alarm_irq_thread(int irq, void *dev) return IRQ_HANDLED; } -static int rockchip_thermal_get_temp(void *_sensor, long *out_temp) +static int rockchip_thermal_get_temp(void *_sensor, unsigned long *out_temp) { struct rockchip_thermal_sensor *sensor = _sensor; struct rockchip_thermal_data *thermal = sensor->thermal; diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c index 1d30b09..5f721f2 100644 --- a/drivers/thermal/samsung/exynos_tmu.c +++ b/drivers/thermal/samsung/exynos_tmu.c @@ -713,7 +713,7 @@ static void exynos7_tmu_control(struct platform_device *pdev, bool on) writel(con, data->base + EXYNOS_TMU_REG_CONTROL); } -static int exynos_get_temp(void *p, long *temp) +static int exynos_get_temp(void *p, unsigned long *temp) { struct exynos_tmu_data *data = p; diff --git a/drivers/thermal/tegra_soctherm.c b/drivers/thermal/tegra_soctherm.c index 9197fc0..1c4e455 100644 --- a/drivers/thermal/tegra_soctherm.c +++ b/drivers/thermal/tegra_soctherm.c @@ -306,7 +306,7 @@ static long translate_temp(u16 val) return t; } -static int tegra_thermctl_get_temp(void *data, long *out_temp) +static int tegra_thermctl_get_temp(void *data, unsigned long *out_temp) { struct tegra_thermctl_zone *zone = data; u32 val; diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c index 7f8e5f3..f480a01 100644 --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c @@ -76,7 +76,7 @@ static inline int ti_thermal_hotspot_temperature(int t, int s, int c) /* thermal zone ops */ /* Get temperature callback function for thermal zone*/ -static inline int __ti_thermal_get_temp(void *devdata, long *temp) +static inline int __ti_thermal_get_temp(void *devdata, unsigned long *temp) { struct thermal_zone_device *pcb_tz = NULL; struct ti_thermal_data *data = devdata; diff --git a/include/linux/thermal.h b/include/linux/thermal.h index ba2e29a..2f77091 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -272,7 +272,7 @@ struct thermal_genl_event { * temperature. */ struct thermal_zone_of_device_ops { - int (*get_temp)(void *, long *); + int (*get_temp)(void *, unsigned long *); int (*get_trend)(void *, int trend, enum thermal_trend *); int (*set_emul_temp)(void *, unsigned long); }; -- 2.1.4
next prev parent reply other threads:[~2015-03-26 15:54 UTC|newest] Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-03-26 15:53 Thermal: Cleanups, fixes and hardware trip points Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-03-26 15:53 ` [PATCH 01/13] thermal: Make temperatures consistently unsigned long Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-03-27 10:18 ` Punit Agrawal 2015-03-27 10:18 ` Punit Agrawal 2015-03-27 19:07 ` Sascha Hauer 2015-03-27 19:07 ` Sascha Hauer 2015-04-07 1:47 ` Eduardo Valentin 2015-04-07 1:47 ` Eduardo Valentin 2015-04-07 1:45 ` Eduardo Valentin 2015-04-07 1:45 ` Eduardo Valentin 2015-04-27 20:36 ` Pavel Machek 2015-04-27 20:36 ` Pavel Machek 2015-04-28 7:42 ` Sascha Hauer 2015-04-28 7:42 ` Sascha Hauer 2015-03-26 15:53 ` [PATCH 02/13] thermal: trivial: fix typo in comment Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 1:49 ` Eduardo Valentin 2015-04-07 1:49 ` Eduardo Valentin 2015-03-26 15:53 ` [PATCH 03/13] thermal: remove useless call to thermal_zone_device_set_polling Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 2:56 ` Eduardo Valentin 2015-04-07 2:56 ` Eduardo Valentin 2015-03-26 15:53 ` [PATCH 04/13] thermal: Fix not emulating critical temperatures Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-03-26 18:13 ` Carlos Hernandez 2015-03-26 18:13 ` Carlos Hernandez 2015-03-26 18:13 ` Carlos Hernandez 2015-03-26 18:55 ` Sascha Hauer 2015-03-26 18:55 ` Sascha Hauer 2015-03-27 3:05 ` amit daniel kachhap 2015-03-27 3:05 ` amit daniel kachhap 2015-03-27 5:23 ` Sascha Hauer 2015-03-27 5:23 ` Sascha Hauer 2015-04-07 2:08 ` Eduardo Valentin 2015-04-07 2:08 ` Eduardo Valentin 2015-03-26 15:53 ` [PATCH 05/13] thermal: inline only once used function Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 2:23 ` Eduardo Valentin 2015-04-07 2:23 ` Eduardo Valentin 2015-04-14 10:44 ` Sascha Hauer 2015-04-14 10:44 ` Sascha Hauer 2015-04-14 10:44 ` Sascha Hauer 2015-03-26 15:53 ` [PATCH 06/13] thermal: streamline get_trend callbacks Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 3:19 ` Eduardo Valentin 2015-04-07 3:19 ` Eduardo Valentin 2015-04-14 10:48 ` Sascha Hauer 2015-04-14 10:48 ` Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer [this message] 2015-03-26 15:53 ` [PATCH 07/13] thermal: of: streamline .get_temp callbacks Sascha Hauer 2015-04-07 2:27 ` Eduardo Valentin 2015-04-07 2:27 ` Eduardo Valentin 2015-03-26 15:53 ` [PATCH 08/13] thermal: Allow sensor ops to fail with -ENOSYS Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-03-26 15:53 ` [PATCH 09/13] thermal: of: always set sensor related callbacks Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 3:25 ` Eduardo Valentin 2015-04-07 3:25 ` Eduardo Valentin 2015-04-14 10:54 ` Sascha Hauer 2015-04-14 10:54 ` Sascha Hauer 2015-03-26 15:53 ` [PATCH 10/13] thermal: Make struct thermal_zone_device_ops const Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 3:29 ` Eduardo Valentin 2015-04-07 3:29 ` Eduardo Valentin 2015-03-26 15:53 ` [PATCH 11/13] thermal: of: make of_thermal_ops const Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 3:27 ` Eduardo Valentin 2015-04-07 3:27 ` Eduardo Valentin 2015-03-26 15:53 ` [PATCH 12/13] thermal: Add support for hardware-tracked trip points Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 2:40 ` Eduardo Valentin 2015-04-07 2:40 ` Eduardo Valentin 2015-04-15 18:06 ` Brian Norris 2015-04-15 18:06 ` Brian Norris 2015-03-26 15:54 ` [PATCH 13/13] thermal: of: implement .set_trips for device tree thermal zones Sascha Hauer 2015-03-26 15:54 ` Sascha Hauer 2015-04-07 2:43 ` Eduardo Valentin 2015-04-07 2:43 ` Eduardo Valentin 2015-04-13 6:30 ` Sascha Hauer 2015-04-13 6:30 ` Sascha Hauer 2015-04-15 17:59 ` Brian Norris 2015-04-15 17:59 ` Brian Norris 2015-04-17 5:22 ` Sascha Hauer 2015-04-17 5:22 ` Sascha Hauer
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1427385240-6086-8-git-send-email-s.hauer@pengutronix.de \ --to=s.hauer@pengutronix.de \ --cc=edubezval@gmail.com \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=linux-pm@vger.kernel.org \ --cc=mikko.perttunen@kapsi.fi \ --cc=rui.zhang@intel.com \ --cc=swarren@wwwdotorg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.