Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp1379336ybl; Wed, 4 Dec 2019 23:58:33 -0800 (PST) X-Google-Smtp-Source: APXvYqyh0Nrw9y9VvNPTY1cSKOyO7DQgv11vbBxm11L7jcTCqp554uctB/Ew9bWDTMIvmt3XwL7m X-Received: by 2002:a05:6830:58:: with SMTP id d24mr5639755otp.356.1575532713209; Wed, 04 Dec 2019 23:58:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575532713; cv=none; d=google.com; s=arc-20160816; b=MMpKBns7XJg8nweZLWDh7FlA7TpynOPAyObIc/nlxGxm2nmYp0ucHHbEbPjRML4aRV BiTbfcaASbr09c28AEFtXg/cclA2UaqTIZhqJmGtc389ljjrRllmoMhE2J/3P0bI+pO/ qC5FdiqeoCE+rPpYbUJwRt8UHLdR0DMG2oulkihnLXWwu3Ch0UtLrK91gXVJC6qm/Vjg XhBWp9Ss3a8VNAQFabo1bW6ulF5qH71byGtAEOC9aQYMH0zRoWxiSPmh+e0jE01u1/9t fqNk6JJz9JqrSDEFAgrdF88ZzyIuDZ/GMnMcCQDtE3eBc/e03aQDudgtPoN8QIWuLILf uYEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:date:cc:to:from:subject:message-id; bh=MKsj30TLip33EEkUVAJI+4X9zMnBqKFq1+IoLUuOZIc=; b=guo2SsgbKxXmUA/ezYNkkfvW4jEI6nIOtE+XWAqMGZzi9tMqZXT2g/OftRAdokEZH+ +rsAQDDLcNeZt9ate0beBQlSunOnbEMtZ/GKHC28us7Ss8izDM7AIYDy34NJvUPsA1zu 4iPuYviUxIBe/MrgKUX007VcV2sGSJCJPBqJ0/V5piRjGyht4sRJVOpBzP3LZAQGo2nu PNDDmW7dJ9wjMPJhaD9cn6Ir0n01YLUZn5MedDv1RXTFW2rmjjtCSHTJnLsAr/A927lp EmVlLyLB3QcC6HFDFvDK0i31URxz4UAXcgoEcamX+fAbOmNSja40Z8sUXDrDdOxqW2g7 81VQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w17si2622198otp.185.2019.12.04.23.58.05; Wed, 04 Dec 2019 23:58:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728419AbfLEH4k (ORCPT + 99 others); Thu, 5 Dec 2019 02:56:40 -0500 Received: from mga17.intel.com ([192.55.52.151]:20787 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726059AbfLEH4k (ORCPT ); Thu, 5 Dec 2019 02:56:40 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Dec 2019 23:56:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,280,1571727600"; d="scan'208";a="209067399" Received: from yuanwan1-mobl.ccr.corp.intel.com ([10.249.174.225]) by fmsmga008.fm.intel.com with ESMTP; 04 Dec 2019 23:56:38 -0800 Message-ID: Subject: Re: [PATCH v2 1/2] thermal: fix and clean up tz and cdev registration From: Zhang Rui To: Amit Kucheria , Wei Wang Cc: Wei Wang , Eduardo Valentin , Daniel Lezcano , Linux PM list , LKML Date: Thu, 05 Dec 2019 15:56:37 +0800 In-Reply-To: References: <20191204215618.125826-1-wvw@google.com> <20191204215618.125826-2-wvw@google.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2019-12-05 at 12:36 +0530, Amit Kucheria wrote: > On Thu, Dec 5, 2019 at 11:56 AM Amit Kucheria > wrote: > > > > On Thu, Dec 5, 2019 at 11:44 AM Wei Wang wrote: > > > > > > On Wed, Dec 4, 2019 at 8:13 PM Amit Kucheria > > > wrote: > > > > > > > > Hi Wei, > > > > > > > > On Thu, Dec 5, 2019 at 3:26 AM Wei Wang 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 > > > > > --- > > > > > 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 > > > > >