All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Eduardo Valentin <edubezval@gmail.com>
Cc: linux-pm@vger.kernel.org, Zhang Rui <rui.zhang@intel.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
Subject: Re: [PATCH 09/13] thermal: of: always set sensor related callbacks
Date: Tue, 14 Apr 2015 12:54:19 +0200	[thread overview]
Message-ID: <20150414105419.GK4946@pengutronix.de> (raw)
In-Reply-To: <20150407032522.GL4648@localhost.localdomain>

On Mon, Apr 06, 2015 at 08:25:23PM -0700, Eduardo Valentin wrote:
> On Thu, Mar 26, 2015 at 04:53:56PM +0100, Sascha Hauer wrote:
> > 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 | 18 +++++++++++-------
> >  1 file changed, 11 insertions(+), 7 deletions(-)
> > 
> > diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
> > index b39e22f..df14fdd 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;
> 
> You may want to update the thermal_zone_of_sensor_unregister too.

Ups, indeed. That hunk accidently went into a later patch.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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/13] thermal: of: always set sensor related callbacks
Date: Tue, 14 Apr 2015 12:54:19 +0200	[thread overview]
Message-ID: <20150414105419.GK4946@pengutronix.de> (raw)
In-Reply-To: <20150407032522.GL4648@localhost.localdomain>

On Mon, Apr 06, 2015 at 08:25:23PM -0700, Eduardo Valentin wrote:
> On Thu, Mar 26, 2015 at 04:53:56PM +0100, Sascha Hauer wrote:
> > 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 | 18 +++++++++++-------
> >  1 file changed, 11 insertions(+), 7 deletions(-)
> > 
> > diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
> > index b39e22f..df14fdd 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;
> 
> You may want to update the thermal_zone_of_sensor_unregister too.

Ups, indeed. That hunk accidently went into a later patch.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

  reply	other threads:[~2015-04-14 10: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 [this message]
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=20150414105419.GK4946@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: link
Be 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.