From: Zhang Rui <rui.zhang@intel.com>
To: Amit Kucheria <amit.kucheria@verdurent.com>, Wei Wang <wvw@google.com>
Cc: Wei Wang <wei.vince.wang@gmail.com>,
Eduardo Valentin <edubezval@gmail.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Linux PM list <linux-pm@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 1/2] thermal: fix and clean up tz and cdev registration
Date: Thu, 05 Dec 2019 15:56:37 +0800 [thread overview]
Message-ID: <a9d9bc3b6ab7b6621157c61da92e55f9c7de0da1.camel@intel.com> (raw)
In-Reply-To: <CAHLCerNT0p7cj+yAhJbNbqCkQguu8AMyngwuvbxaQYTSAB5GPA@mail.gmail.com>
On Thu, 2019-12-05 at 12:36 +0530, Amit Kucheria wrote:
> On Thu, Dec 5, 2019 at 11:56 AM Amit Kucheria
> <amit.kucheria@verdurent.com> wrote:
> >
> > On Thu, Dec 5, 2019 at 11:44 AM Wei Wang <wvw@google.com> wrote:
> > >
> > > On Wed, Dec 4, 2019 at 8:13 PM Amit Kucheria
> > > <amit.kucheria@verdurent.com> wrote:
> > > >
> > > > Hi Wei,
> > > >
> > > > On Thu, Dec 5, 2019 at 3:26 AM Wei Wang <wvw@google.com> wrote:
> > > > >
> > > > > Make cooling device registration behavior consistent with
> > > >
> > > > Consistent how? Please add details.
> > > >
> > >
> > > Consistent with
> > >
https://lore.kernel.org/linux-pm/1478581767-7009-2-git-send-email-edubezval@gmail.com/
>
> Studying this a bit more, git blame pointed to this SHA[1] that fixed
> it so that NULL value for 'type' is allowed, we just check for it.
> However, none of the users of thermal_cooling_device_register() seem
> to pass NULL.
>
> Rui, any insight into the history of why we would NOT want to create
> a
> sysfs attribute by passing NULL?
Actually, I don't recall there is any requirement that wants to
register a cooling_device without "type".
> Do we still need to allow for NULL
> values or should we cleanup the API to prevent NULL values?
>
well, my suggestion is to make this (do NULL check) a separate patch
and see if we have any complains, if yes, we can revert it easily.
thanks,
rui
> [1] 204dd1d39c32f39a95
>
>
> > >
> > > will include aboce in next version.
> >
> > Thanks.
> >
> > >
> > > > > thermal zone. This patch also cleans up a unnecessary
> > > > > nullptr check.
> > > > >
> > > > > Signed-off-by: Wei Wang <wvw@google.com>
> > > > > ---
> > > > > drivers/thermal/thermal_core.c | 16 ++++++++++++----
> > > > > 1 file changed, 12 insertions(+), 4 deletions(-)
> > > > >
> > > > > diff --git a/drivers/thermal/thermal_core.c
> > > > > b/drivers/thermal/thermal_core.c
> > > > > index d4481cc8958f..64fbb59c2f44 100644
> > > > > --- a/drivers/thermal/thermal_core.c
> > > > > +++ b/drivers/thermal/thermal_core.c
> > > > > @@ -954,8 +954,16 @@ __thermal_cooling_device_register(struct
> > > > > device_node *np,
> > > > > struct thermal_zone_device *pos = NULL;
> > > > > int result;
> > > > >
> > > > > - if (type && strlen(type) >= THERMAL_NAME_LENGTH)
> > > > > - return ERR_PTR(-EINVAL);
> > > > > + if (!type || !type[0]) {
> > > > > + pr_err("Error: No cooling device type
> > > > > defined\n");
> > > > > + return ERR_PTR(-EINVAL);
> > > > > + }
> > > > > +
> > > > > + if (strlen(type) >= THERMAL_NAME_LENGTH) {
> > > > > + pr_err("Error: Cooling device name (%s) too long,
> > > > > "
> > > > > + "should be under %d chars\n", type,
> > > > > THERMAL_NAME_LENGTH);
> > > >
> > > > Consider fitting into a single greppable string as "Error:
> > > > Cooling
> > > > device name over %d chars: %s\n"
> > > >
> > >
> > > Was intentionally keep it the same as this
> > >
https://lore.kernel.org/linux-pm/31a29628894a14e716fff113fd9ce945fe649c05.1562876950.git.amit.kucheria@linaro.org/
> > > Will make it shorter in both places next verion
> >
> > Yes please, make it a separate patch. We didn't catch it during
> > review.
> >
> > >
> > > > > + return ERR_PTR(-EINVAL);
> > > > > + }
> > > > >
> > > > > if (!ops || !ops->get_max_state || !ops-
> > > > > >get_cur_state ||
> > > > > !ops->set_cur_state)
> > > > > @@ -972,7 +980,7 @@ __thermal_cooling_device_register(struct
> > > > > device_node *np,
> > > > > }
> > > > >
> > > > > cdev->id = result;
> > > > > - strlcpy(cdev->type, type ? : "", sizeof(cdev->type));
> > > > > + strlcpy(cdev->type, type, sizeof(cdev->type));
> > > > > mutex_init(&cdev->lock);
> > > > > INIT_LIST_HEAD(&cdev->thermal_instances);
> > > > > cdev->np = np;
> > > > > @@ -1250,7 +1258,7 @@ thermal_zone_device_register(const char
> > > > > *type, int trips, int mask,
> > > > > return ERR_PTR(-EINVAL);
> > > > > }
> > > > >
> > > > > - if (type && strlen(type) >= THERMAL_NAME_LENGTH) {
> > > > > + if (strlen(type) >= THERMAL_NAME_LENGTH) {
> > > > > pr_err("Error: Thermal zone name (%s) too
> > > > > long, should be under %d chars\n",
> > > > > type, THERMAL_NAME_LENGTH);
> > > > > return ERR_PTR(-EINVAL);
> > > > > --
> > > > > 2.24.0.393.g34dc348eaf-goog
> > > > >
next prev parent reply other threads:[~2019-12-05 7:56 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-15 6:13 [PATCH] thermal: create softlink by name for thermal_zone and cooling_device Wei Wang
2019-10-16 16:50 ` Amit Kucheria
2019-10-16 17:15 ` Amit Kucheria
2019-10-16 21:34 ` Wei Wang
2019-11-11 5:26 ` Amit Kucheria
2019-11-11 17:52 ` Wei Wang
2019-12-04 12:45 ` Amit Kucheria
2019-12-04 21:56 ` [PATCH v2 0/2] thermal: introduce by-name softlink Wei Wang
2019-12-04 21:56 ` [PATCH v2 1/2] thermal: fix and clean up tz and cdev registration Wei Wang
2019-12-05 4:13 ` Amit Kucheria
2019-12-05 6:14 ` Wei Wang
2019-12-05 6:26 ` Amit Kucheria
2019-12-05 7:06 ` Amit Kucheria
2019-12-05 7:56 ` Zhang Rui [this message]
2019-12-04 21:56 ` [PATCH v2 2/2] thermal: create softlink by name for thermal_zone and cooling_device Wei Wang
2019-12-05 4:14 ` Amit Kucheria
2019-12-04 21:58 ` [PATCH] " Wei Wang
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=a9d9bc3b6ab7b6621157c61da92e55f9c7de0da1.camel@intel.com \
--to=rui.zhang@intel.com \
--cc=amit.kucheria@verdurent.com \
--cc=daniel.lezcano@linaro.org \
--cc=edubezval@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=wei.vince.wang@gmail.com \
--cc=wvw@google.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).