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 09/16] thermal: of: always set sensor related callbacks Date: Wed, 20 May 2015 15:20:39 +0200 [thread overview] Message-ID: <1432128046-12921-10-git-send-email-s.hauer@pengutronix.de> (raw) In-Reply-To: <1432128046-12921-1-git-send-email-s.hauer@pengutronix.de> Now that the thermal core treats -ENOSYS like the callbacks were not present at all we no longer have to overwrite the ops during runtime but instead can always set them and return -ENOSYS if no sensor is registered. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- drivers/thermal/of-thermal.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c index c84404d..b9c35bd 100644 --- a/drivers/thermal/of-thermal.c +++ b/drivers/thermal/of-thermal.c @@ -91,7 +91,7 @@ static int of_thermal_get_temp(struct thermal_zone_device *tz, { struct __thermal_zone *data = tz->devdata; - if (!data->ops->get_temp) + if (!data->ops) return -EINVAL; return data->ops->get_temp(data->sensor_data, temp); @@ -178,7 +178,7 @@ static int of_thermal_set_emul_temp(struct thermal_zone_device *tz, struct __thermal_zone *data = tz->devdata; if (!data->ops || !data->ops->set_emul_temp) - return -EINVAL; + return -ENOSYS; return data->ops->set_emul_temp(data->sensor_data, temp); } @@ -189,8 +189,8 @@ static int of_thermal_get_trend(struct thermal_zone_device *tz, int trip, struct __thermal_zone *data = tz->devdata; int r; - if (!data->ops->get_trend) - return -EINVAL; + if (!data->ops || !data->ops->get_trend) + return -ENOSYS; r = data->ops->get_trend(data->sensor_data, trip, trend); if (r) @@ -366,6 +366,10 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz, } static struct thermal_zone_device_ops of_thermal_ops = { + .get_temp = of_thermal_get_temp, + .get_trend = of_thermal_get_trend, + .set_emul_temp = of_thermal_set_emul_temp, + .get_mode = of_thermal_get_mode, .set_mode = of_thermal_set_mode, @@ -399,13 +403,13 @@ thermal_zone_of_add_sensor(struct device_node *zone, if (!ops) return ERR_PTR(-EINVAL); + if (!ops->get_temp) + return ERR_PTR(-EINVAL); + mutex_lock(&tzd->lock); tz->ops = ops; tz->sensor_data = data; - tzd->ops->get_temp = of_thermal_get_temp; - tzd->ops->get_trend = of_thermal_get_trend; - tzd->ops->set_emul_temp = of_thermal_set_emul_temp; mutex_unlock(&tzd->lock); return tzd; @@ -535,9 +539,6 @@ void thermal_zone_of_sensor_unregister(struct device *dev, return; mutex_lock(&tzd->lock); - tzd->ops->get_temp = NULL; - tzd->ops->get_trend = NULL; - tzd->ops->set_emul_temp = NULL; tz->ops = NULL; tz->sensor_data = NULL; @@ -845,7 +846,6 @@ int __init of_parse_thermal_zones(void) { struct device_node *np, *child; struct __thermal_zone *tz; - struct thermal_zone_device_ops *ops; np = of_find_node_by_name(NULL, "thermal-zones"); if (!np) { @@ -869,29 +869,22 @@ int __init of_parse_thermal_zones(void) continue; } - ops = kmemdup(&of_thermal_ops, sizeof(*ops), GFP_KERNEL); - if (!ops) - goto exit_free; - tzp = kzalloc(sizeof(*tzp), GFP_KERNEL); - if (!tzp) { - kfree(ops); + if (!tzp) goto exit_free; - } /* No hwmon because there might be hwmon drivers registering */ tzp->no_hwmon = true; zone = thermal_zone_device_register(child->name, tz->ntrips, 0, tz, - ops, tzp, + &of_thermal_ops, tzp, tz->passive_delay, tz->polling_delay); if (IS_ERR(zone)) { pr_err("Failed to build %s zone %ld\n", child->name, PTR_ERR(zone)); kfree(tzp); - kfree(ops); of_thermal_free_zone(tz); /* attempting to build remaining zones still */ } -- 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 09/16] thermal: of: always set sensor related callbacks Date: Wed, 20 May 2015 15:20:39 +0200 [thread overview] Message-ID: <1432128046-12921-10-git-send-email-s.hauer@pengutronix.de> (raw) In-Reply-To: <1432128046-12921-1-git-send-email-s.hauer@pengutronix.de> Now that the thermal core treats -ENOSYS like the callbacks were not present at all we no longer have to overwrite the ops during runtime but instead can always set them and return -ENOSYS if no sensor is registered. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- drivers/thermal/of-thermal.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c index c84404d..b9c35bd 100644 --- a/drivers/thermal/of-thermal.c +++ b/drivers/thermal/of-thermal.c @@ -91,7 +91,7 @@ static int of_thermal_get_temp(struct thermal_zone_device *tz, { struct __thermal_zone *data = tz->devdata; - if (!data->ops->get_temp) + if (!data->ops) return -EINVAL; return data->ops->get_temp(data->sensor_data, temp); @@ -178,7 +178,7 @@ static int of_thermal_set_emul_temp(struct thermal_zone_device *tz, struct __thermal_zone *data = tz->devdata; if (!data->ops || !data->ops->set_emul_temp) - return -EINVAL; + return -ENOSYS; return data->ops->set_emul_temp(data->sensor_data, temp); } @@ -189,8 +189,8 @@ static int of_thermal_get_trend(struct thermal_zone_device *tz, int trip, struct __thermal_zone *data = tz->devdata; int r; - if (!data->ops->get_trend) - return -EINVAL; + if (!data->ops || !data->ops->get_trend) + return -ENOSYS; r = data->ops->get_trend(data->sensor_data, trip, trend); if (r) @@ -366,6 +366,10 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz, } static struct thermal_zone_device_ops of_thermal_ops = { + .get_temp = of_thermal_get_temp, + .get_trend = of_thermal_get_trend, + .set_emul_temp = of_thermal_set_emul_temp, + .get_mode = of_thermal_get_mode, .set_mode = of_thermal_set_mode, @@ -399,13 +403,13 @@ thermal_zone_of_add_sensor(struct device_node *zone, if (!ops) return ERR_PTR(-EINVAL); + if (!ops->get_temp) + return ERR_PTR(-EINVAL); + mutex_lock(&tzd->lock); tz->ops = ops; tz->sensor_data = data; - tzd->ops->get_temp = of_thermal_get_temp; - tzd->ops->get_trend = of_thermal_get_trend; - tzd->ops->set_emul_temp = of_thermal_set_emul_temp; mutex_unlock(&tzd->lock); return tzd; @@ -535,9 +539,6 @@ void thermal_zone_of_sensor_unregister(struct device *dev, return; mutex_lock(&tzd->lock); - tzd->ops->get_temp = NULL; - tzd->ops->get_trend = NULL; - tzd->ops->set_emul_temp = NULL; tz->ops = NULL; tz->sensor_data = NULL; @@ -845,7 +846,6 @@ int __init of_parse_thermal_zones(void) { struct device_node *np, *child; struct __thermal_zone *tz; - struct thermal_zone_device_ops *ops; np = of_find_node_by_name(NULL, "thermal-zones"); if (!np) { @@ -869,29 +869,22 @@ int __init of_parse_thermal_zones(void) continue; } - ops = kmemdup(&of_thermal_ops, sizeof(*ops), GFP_KERNEL); - if (!ops) - goto exit_free; - tzp = kzalloc(sizeof(*tzp), GFP_KERNEL); - if (!tzp) { - kfree(ops); + if (!tzp) goto exit_free; - } /* No hwmon because there might be hwmon drivers registering */ tzp->no_hwmon = true; zone = thermal_zone_device_register(child->name, tz->ntrips, 0, tz, - ops, tzp, + &of_thermal_ops, tzp, tz->passive_delay, tz->polling_delay); if (IS_ERR(zone)) { pr_err("Failed to build %s zone %ld\n", child->name, PTR_ERR(zone)); kfree(tzp); - kfree(ops); of_thermal_free_zone(tz); /* attempting to build remaining zones still */ } -- 2.1.4
next prev parent reply other threads:[~2015-05-20 13:21 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-05-20 13:20 [PATCH v4] Thermal cleanups and hardware trip points Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 01/16] thermal: consistently use int for temperatures Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 02/16] thermal: trivial: fix typo in comment Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 03/16] thermal: remove useless call to thermal_zone_device_set_polling Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 04/16] thermal: Use IS_ENABLED instead of #ifdef Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 05/16] thermal: Add comment explaining test for critical temperature Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 06/16] thermal: inline only once used function Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 07/16] thermal: streamline get_trend callbacks Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 08/16] thermal: Allow sensor ops to fail with -ENOSYS Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer [this message] 2015-05-20 13:20 ` [PATCH 09/16] thermal: of: always set sensor related callbacks Sascha Hauer 2015-05-20 13:20 ` [PATCH 10/16] thermal: Make struct thermal_zone_device_ops const Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 11/16] thermal: bang-bang governor: act on lower trip boundary Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 12/16] thermal: thermal: Add support for hardware-tracked trip points Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 13/16] thermal: of: implement .set_trips for device tree thermal zones Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 14/16] dt-bindings: thermal: Add binding document for Mediatek thermal controller Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 15/16] thermal: Add Mediatek thermal controller support Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 16/16] ARM64: dts: mt8173: Add thermal/auxadc device nodes Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-06-08 6:56 ` [PATCH v4] Thermal cleanups and hardware trip points Sascha Hauer 2015-06-08 6:56 ` Sascha Hauer 2015-06-22 6:38 ` Sascha Hauer 2015-06-22 6:38 ` Sascha Hauer 2015-06-22 6:38 ` 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=1432128046-12921-10-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.