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, Brian Norris <computersforpeace@gmail.com>, Sascha Hauer <s.hauer@pengutronix.de> Subject: [PATCH 08/13] thermal: streamline get_trend callbacks Date: Tue, 28 Apr 2015 10:25:58 +0200 [thread overview] Message-ID: <1430209563-647-9-git-send-email-s.hauer@pengutronix.de> (raw) In-Reply-To: <1430209563-647-1-git-send-email-s.hauer@pengutronix.de> The .get_trend callback in struct thermal_zone_device_ops has the prototype: int (*get_trend) (struct thermal_zone_device *, int, enum thermal_trend *); whereas the .get_trend callback in struct thermal_zone_of_device_ops has: int (*get_trend)(void *, long *); Streamline both prototypes and add the trip argument to the OF callback aswell and use enum thermal_trend * instead of an integer pointer. While the OF prototype may be the better one, this should be decided at framework level and not on OF level. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- drivers/thermal/of-thermal.c | 11 +--------- drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 25 +++++++--------------- include/linux/thermal.h | 2 +- 3 files changed, 10 insertions(+), 28 deletions(-) diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c index 03839df..c84404d 100644 --- a/drivers/thermal/of-thermal.c +++ b/drivers/thermal/of-thermal.c @@ -187,24 +187,15 @@ static int of_thermal_get_trend(struct thermal_zone_device *tz, int trip, enum thermal_trend *trend) { struct __thermal_zone *data = tz->devdata; - long dev_trend; int r; if (!data->ops->get_trend) return -EINVAL; - r = data->ops->get_trend(data->sensor_data, &dev_trend); + r = data->ops->get_trend(data->sensor_data, trip, trend); if (r) return r; - /* TODO: These intervals might have some thresholds, but in core code */ - if (dev_trend > 0) - *trend = THERMAL_TREND_RAISING; - else if (dev_trend < 0) - *trend = THERMAL_TREND_DROPPING; - else - *trend = THERMAL_TREND_STABLE; - return 0; } diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c index d3a42bf..ade78eb 100644 --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c @@ -238,7 +238,7 @@ static int ti_thermal_get_trip_temp(struct thermal_zone_device *thermal, return 0; } -static int __ti_thermal_get_trend(void *p, long *trend) +static int __ti_thermal_get_trend(void *p, int trip, enum thermal_trend *trend) { struct ti_thermal_data *data = p; struct ti_bandgap *bgp; @@ -251,22 +251,6 @@ static int __ti_thermal_get_trend(void *p, long *trend) if (ret) return ret; - *trend = tr; - - return 0; -} - -/* Get the temperature trend callback functions for thermal zone */ -static int ti_thermal_get_trend(struct thermal_zone_device *thermal, - int trip, enum thermal_trend *trend) -{ - int ret; - long tr; - - ret = __ti_thermal_get_trend(thermal->devdata, &tr); - if (ret) - return ret; - if (tr > 0) *trend = THERMAL_TREND_RAISING; else if (tr < 0) @@ -277,6 +261,13 @@ static int ti_thermal_get_trend(struct thermal_zone_device *thermal, return 0; } +/* Get the temperature trend callback functions for thermal zone */ +static int ti_thermal_get_trend(struct thermal_zone_device *thermal, + int trip, enum thermal_trend *trend) +{ + return __ti_thermal_get_trend(thermal->devdata, trip, trend); +} + /* Get critical temperature callback functions for thermal zone */ static int ti_thermal_get_crit_temp(struct thermal_zone_device *thermal, int *temp) diff --git a/include/linux/thermal.h b/include/linux/thermal.h index e9f2863..5c6a589 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -269,7 +269,7 @@ struct thermal_genl_event { */ struct thermal_zone_of_device_ops { int (*get_temp)(void *, int *); - int (*get_trend)(void *, long *); + int (*get_trend)(void *, int, enum thermal_trend *); int (*set_emul_temp)(void *, int); }; -- 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 08/13] thermal: streamline get_trend callbacks Date: Tue, 28 Apr 2015 10:25:58 +0200 [thread overview] Message-ID: <1430209563-647-9-git-send-email-s.hauer@pengutronix.de> (raw) In-Reply-To: <1430209563-647-1-git-send-email-s.hauer@pengutronix.de> The .get_trend callback in struct thermal_zone_device_ops has the prototype: int (*get_trend) (struct thermal_zone_device *, int, enum thermal_trend *); whereas the .get_trend callback in struct thermal_zone_of_device_ops has: int (*get_trend)(void *, long *); Streamline both prototypes and add the trip argument to the OF callback aswell and use enum thermal_trend * instead of an integer pointer. While the OF prototype may be the better one, this should be decided at framework level and not on OF level. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- drivers/thermal/of-thermal.c | 11 +--------- drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 25 +++++++--------------- include/linux/thermal.h | 2 +- 3 files changed, 10 insertions(+), 28 deletions(-) diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c index 03839df..c84404d 100644 --- a/drivers/thermal/of-thermal.c +++ b/drivers/thermal/of-thermal.c @@ -187,24 +187,15 @@ static int of_thermal_get_trend(struct thermal_zone_device *tz, int trip, enum thermal_trend *trend) { struct __thermal_zone *data = tz->devdata; - long dev_trend; int r; if (!data->ops->get_trend) return -EINVAL; - r = data->ops->get_trend(data->sensor_data, &dev_trend); + r = data->ops->get_trend(data->sensor_data, trip, trend); if (r) return r; - /* TODO: These intervals might have some thresholds, but in core code */ - if (dev_trend > 0) - *trend = THERMAL_TREND_RAISING; - else if (dev_trend < 0) - *trend = THERMAL_TREND_DROPPING; - else - *trend = THERMAL_TREND_STABLE; - return 0; } diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c index d3a42bf..ade78eb 100644 --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c @@ -238,7 +238,7 @@ static int ti_thermal_get_trip_temp(struct thermal_zone_device *thermal, return 0; } -static int __ti_thermal_get_trend(void *p, long *trend) +static int __ti_thermal_get_trend(void *p, int trip, enum thermal_trend *trend) { struct ti_thermal_data *data = p; struct ti_bandgap *bgp; @@ -251,22 +251,6 @@ static int __ti_thermal_get_trend(void *p, long *trend) if (ret) return ret; - *trend = tr; - - return 0; -} - -/* Get the temperature trend callback functions for thermal zone */ -static int ti_thermal_get_trend(struct thermal_zone_device *thermal, - int trip, enum thermal_trend *trend) -{ - int ret; - long tr; - - ret = __ti_thermal_get_trend(thermal->devdata, &tr); - if (ret) - return ret; - if (tr > 0) *trend = THERMAL_TREND_RAISING; else if (tr < 0) @@ -277,6 +261,13 @@ static int ti_thermal_get_trend(struct thermal_zone_device *thermal, return 0; } +/* Get the temperature trend callback functions for thermal zone */ +static int ti_thermal_get_trend(struct thermal_zone_device *thermal, + int trip, enum thermal_trend *trend) +{ + return __ti_thermal_get_trend(thermal->devdata, trip, trend); +} + /* Get critical temperature callback functions for thermal zone */ static int ti_thermal_get_crit_temp(struct thermal_zone_device *thermal, int *temp) diff --git a/include/linux/thermal.h b/include/linux/thermal.h index e9f2863..5c6a589 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -269,7 +269,7 @@ struct thermal_genl_event { */ struct thermal_zone_of_device_ops { int (*get_temp)(void *, int *); - int (*get_trend)(void *, long *); + int (*get_trend)(void *, int, enum thermal_trend *); int (*set_emul_temp)(void *, int); }; -- 2.1.4
next prev parent reply other threads:[~2015-04-28 8:26 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-04-28 8:25 [PATCH v2] Thermal cleanups and hardware trip points Sascha Hauer 2015-04-28 8:25 ` Sascha Hauer 2015-04-28 8:25 ` [PATCH 01/13] thermal: consistently use int for temperatures Sascha Hauer 2015-04-28 8:25 ` Sascha Hauer 2015-04-28 8:25 ` [PATCH 02/13] thermal: trivial: fix typo in comment Sascha Hauer 2015-04-28 8:25 ` Sascha Hauer 2015-04-28 8:25 ` [PATCH 03/13] thermal: trivial: Add missing whitespace in message Sascha Hauer 2015-04-28 8:25 ` Sascha Hauer 2015-04-28 8:25 ` Sascha Hauer 2015-04-28 8:25 ` [PATCH 04/13] thermal: remove useless call to thermal_zone_device_set_polling Sascha Hauer 2015-04-28 8:25 ` Sascha Hauer 2015-04-28 8:25 ` [PATCH 05/13] thermal: Use IS_ENABLED instead of #ifdef Sascha Hauer 2015-04-28 8:25 ` Sascha Hauer 2015-04-28 8:25 ` [PATCH 06/13] thermal: Add comment explaining test for critical temperature Sascha Hauer 2015-04-28 8:25 ` Sascha Hauer 2015-04-28 8:25 ` [PATCH 07/13] thermal: inline only once used function Sascha Hauer 2015-04-28 8:25 ` Sascha Hauer 2015-04-28 8:25 ` Sascha Hauer [this message] 2015-04-28 8:25 ` [PATCH 08/13] thermal: streamline get_trend callbacks Sascha Hauer 2015-04-28 8:25 ` [PATCH 09/13] thermal: Allow sensor ops to fail with -ENOSYS Sascha Hauer 2015-04-28 8:25 ` Sascha Hauer 2015-04-28 8:26 ` [PATCH 10/13] thermal: of: always set sensor related callbacks Sascha Hauer 2015-04-28 8:26 ` Sascha Hauer 2015-04-28 8:26 ` Sascha Hauer 2015-04-28 8:26 ` [PATCH 11/13] thermal: Make struct thermal_zone_device_ops const Sascha Hauer 2015-04-28 8:26 ` Sascha Hauer 2015-04-28 8:26 ` [PATCH 12/13] thermal: thermal: Add support for hardware-tracked trip points Sascha Hauer 2015-04-28 8:26 ` Sascha Hauer 2015-04-28 8:26 ` [PATCH 13/13] thermal: of: implement .set_trips for device tree thermal zones Sascha Hauer 2015-04-28 8:26 ` 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=1430209563-647-9-git-send-email-s.hauer@pengutronix.de \ --to=s.hauer@pengutronix.de \ --cc=computersforpeace@gmail.com \ --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.