From patchwork Sat Jul 2 02:41:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 9210673 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8828C60752 for ; Sat, 2 Jul 2016 02:42:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C28C286D1 for ; Sat, 2 Jul 2016 02:42:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F90428672; Sat, 2 Jul 2016 02:42:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C4463286D5 for ; Sat, 2 Jul 2016 02:42:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752081AbcGBCmB (ORCPT ); Fri, 1 Jul 2016 22:42:01 -0400 Received: from mail-pa0-f68.google.com ([209.85.220.68]:35633 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751992AbcGBCmA (ORCPT ); Fri, 1 Jul 2016 22:42:00 -0400 Received: by mail-pa0-f68.google.com with SMTP id hf6so10954534pac.2; Fri, 01 Jul 2016 19:41:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=Mj2Sd9G8z6PLVz7VFrq9P2ylYj1diAj8SRGgqZZoaz0=; b=diiL+wUZz/8ureKI1vi3lFwyiqEHSn0o/BccOULr7/LF/LAwRYhz219i3CJBW5KCQH TT0c2mcsCPxMKffaqrob3MFiNMh6Wa/2cfIw4en4n3xMdK9ZBhKE198s6zirP+cVZfAb 7NCpghZZq+C5cd6sYaUxNr/iIDdnkZPpLF9Ot4pRASgTPGui7ivgcG3NekKC1pySuMAo bS0LPtYyKlNnSu/eDtKiAeAQIptYVHcP20iTWKuRwcg1m/REdbWJmrfNRtUFOKpF3E5S B0ochpkru2MMTWs7/wkiGcll7tnoM/+pMYiS8T9A4XRovcRCsBruytzaKmeA7/IetqYI Mm1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=Mj2Sd9G8z6PLVz7VFrq9P2ylYj1diAj8SRGgqZZoaz0=; b=c+M9uJe3vsjV3+XX+qJeOyF4oJrIEKvMJ3o0NprEmk8oGRnUjsoq02dv+e4+M4yoLd ZXqhtOCCbzvCnukHbOi9cZxd9YPFvBPHFbenag1jH51eWF/LDA+dRdWS1fWKr7JTvd7J tJ24lhXnRK54R7YP+Cq5W2qbfCrCxl5Ad1cCEMBKPKOVSnTke2gWtZPJd6Zn5o91tMeo zmM4SuUyX7qyoxbqLn07c4HEcT1X/LAZOGjK3gWofruXaMb/3TmTo4tQJ7D1nE7virao sZLGwSe9Qg9xDDSK0YxD6Wb5lKpf8S3Hlf6UVWjlmm36I8czta9j5LSA4HaoKOu3fVL4 b9EA== X-Gm-Message-State: ALyK8tLxiVwKSz4SGwCypBrrd1uUhOXVhzZ4ZTeqovbO4i7UCHo5GW2tVESIiQWyf066Og== X-Received: by 10.66.179.168 with SMTP id dh8mr2446688pac.36.1467427319077; Fri, 01 Jul 2016 19:41:59 -0700 (PDT) Received: from localhost.localdomain ([2601:647:4203:ca60:7256:81ff:febd:926d]) by smtp.gmail.com with ESMTPSA id z189sm855483pfb.34.2016.07.01.19.41.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Jul 2016 19:41:58 -0700 (PDT) Date: Fri, 1 Jul 2016 19:41:54 -0700 From: Eduardo Valentin To: Caesar Wang Cc: linux-pm@vger.kernel.org, Heiko Stuebner , dianders@chromium.org, briannorris@google.com, smbarber@google.com, linux-rockchip@lists.infradead.org, cf@rock-chips.com, huangtao@rock-chips.com, dmitry.torokhov@gmail.com, javi.merino@arm.com, peter@piie.net, rocky.hao@rock-chips.com, Sascha Hauer , Zhang Rui , Keerthy , linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org Subject: Re: [PATCH v6 3/5] thermal: streamline get_trend callbacks Message-ID: <20160702024153.GA26067@localhost.localdomain> References: <1466584925-4829-1-git-send-email-wxt@rock-chips.com> <1466584925-4829-4-git-send-email-wxt@rock-chips.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1466584925-4829-4-git-send-email-wxt@rock-chips.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Wed, Jun 22, 2016 at 04:42:03PM +0800, Caesar Wang wrote: > From: Sascha Hauer > > 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 > Signed-off-by: Caesar Wang > Cc: Zhang Rui > Cc: Eduardo Valentin > Cc: linux-pm@vger.kernel.org > Reviewed-by: Keerthy I had to append the following diff, because I merged a new qsens driver: > > --- > > Changes in v6: > - as the Keerthy comments on https://patchwork.kernel.org/patch/9157913/, > change the get_trend for of_thermal.c. > > Changes in v5: None > Changes in v4: None > Changes in v3: None > Changes in v2: None > > drivers/thermal/of-thermal.c | 16 +------------- > drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 25 +++++++--------------- > include/linux/thermal.h | 2 +- > 3 files changed, 10 insertions(+), 33 deletions(-) > > diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c > index 2d2a06f..20822ab 100644 > --- a/drivers/thermal/of-thermal.c > +++ b/drivers/thermal/of-thermal.c > @@ -202,25 +202,11 @@ 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); > - 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; > + return data->ops->get_trend(data->sensor_data, trip, trend); > } > > static int of_thermal_bind(struct thermal_zone_device *thermal, > diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c > index 15c0a9a..4a6757c 100644 > --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c > +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c > @@ -239,7 +239,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; > @@ -252,22 +252,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) > @@ -278,6 +262,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 2440b8d..d3ce3a5 100644 > --- a/include/linux/thermal.h > +++ b/include/linux/thermal.h > @@ -352,7 +352,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_trips)(void *, int, int); > int (*set_emul_temp)(void *, int); > int (*set_trip_temp)(void *, int, int); > -- > 1.9.1 > --- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c index b182272..446f70b 100644 --- a/drivers/thermal/qcom/tsens.c +++ b/drivers/thermal/qcom/tsens.c @@ -29,13 +29,13 @@ static int tsens_get_temp(void *data, int *temp) return tmdev->ops->get_temp(tmdev, s->id, temp); } -static int tsens_get_trend(void *data, long *temp) +static int tsens_get_trend(void *p, int trip, enum thermal_trend *trend) { - const struct tsens_sensor *s = data; + const struct tsens_sensor *s = p; struct tsens_device *tmdev = s->tmdev; if (tmdev->ops->get_trend) - return tmdev->ops->get_trend(tmdev, s->id, temp); + return tmdev->ops->get_trend(tmdev, s->id, trend); return -ENOTSUPP; }