All of lore.kernel.org
 help / color / mirror / Atom feed
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 11/13] thermal: of: make of_thermal_ops const
Date: Thu, 26 Mar 2015 16:53:58 +0100	[thread overview]
Message-ID: <1427385240-6086-12-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1427385240-6086-1-git-send-email-s.hauer@pengutronix.de>

Now that we no longer modify the ops they can be const again. Also
we no longer have to duplicate them.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/thermal/of-thermal.c | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
index df14fdd..9b63193 100644
--- a/drivers/thermal/of-thermal.c
+++ b/drivers/thermal/of-thermal.c
@@ -365,7 +365,7 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz,
 	return -EINVAL;
 }
 
-static struct thermal_zone_device_ops of_thermal_ops = {
+static const 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,
@@ -539,10 +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;
 	mutex_unlock(&tzd->lock);
@@ -849,7 +845,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) {
@@ -873,29 +868,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
From: s.hauer@pengutronix.de (Sascha Hauer)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/13] thermal: of: make of_thermal_ops const
Date: Thu, 26 Mar 2015 16:53:58 +0100	[thread overview]
Message-ID: <1427385240-6086-12-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1427385240-6086-1-git-send-email-s.hauer@pengutronix.de>

Now that we no longer modify the ops they can be const again. Also
we no longer have to duplicate them.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/thermal/of-thermal.c | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
index df14fdd..9b63193 100644
--- a/drivers/thermal/of-thermal.c
+++ b/drivers/thermal/of-thermal.c
@@ -365,7 +365,7 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz,
 	return -EINVAL;
 }
 
-static struct thermal_zone_device_ops of_thermal_ops = {
+static const 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,
@@ -539,10 +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;
 	mutex_unlock(&tzd->lock);
@@ -849,7 +845,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) {
@@ -873,29 +868,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

  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 ` [PATCH 07/13] thermal: of: streamline .get_temp callbacks Sascha Hauer
2015-03-26 15:53   ` 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 ` Sascha Hauer [this message]
2015-03-26 15:53   ` [PATCH 11/13] thermal: of: make of_thermal_ops const 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-12-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 \
    --subject='Re: [PATCH 11/13] thermal: of: make of_thermal_ops const' \
    /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: link

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.