From patchwork Fri Dec 1 21:08:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rafael J. Wysocki" X-Patchwork-Id: 172660 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp1417683vqy; Fri, 1 Dec 2023 13:08:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IH+hHwazq3LEtR64EfdCV31tfcuFZBuv0kVjvITwYBnUwPpBMLyu3gN+sVisGAxBQdZ0YcN X-Received: by 2002:a17:903:2346:b0:1d0:6ffe:1e77 with SMTP id c6-20020a170903234600b001d06ffe1e77mr133700plh.90.1701464926793; Fri, 01 Dec 2023 13:08:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701464926; cv=none; d=google.com; s=arc-20160816; b=lvk8j5CzUfW3QSVOp88lDbXW9mWIDZcbyLMw32HM5OOIBVdRDnWsIs2R+iifPNQv1a KwdMZu6bW8RRN+eDHmEfahUGsq5vDidISXXg3Vlotu5KnkPD9XOm2w0aXG8o66NfyhNK SojrtptzraG7pQV2WF5Ph2gLrgfcblKDMycVxEK8/WWXbFXn/KL7yFSHMTqshsMo6jb3 SzGMVQ+TH0LHNOTINz/WNWzYDfyHJ8o8RTKtNeFWEC6m6eeHbrsqh/ZTFSs5WDQ5dPCN sdsRuIKxkKFCw6x2MBpYf+m7+/8D1gVG80JWp8CoR1KCfiYRdCzB8PIK10hiin80jEUZ ZkkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=2XTlH3XeAG7CPGVjzJnM1fqINIWLFV56l3VS8cdSSD8=; fh=nLypB3rvk504GacFIka1NRIrs+dxk/mQtlixTJ9Bzjw=; b=Os57937gam+QCIDstlcsOHOa2yjY3+EuE78Bo8lG7OC1npg0qKU5KPrWSqJeWqcW/N U1PpJvKItTD+BnqZ3tPTJlxkaIHceBeV4YD1wCFf75qvYuE/b6aoRW8UWuArRZPqxP27 MepBPHTTY/kL1l+U8LC/92t5UG4uT+BEuhGgMtkkss/neSM1eL+tsPhsKlvQ9i5qmOq9 u38j7+4F/hknJzWd8imiAB9lGgT8SaHOsBLSkz7sSU13+SfDYBiB7azjmkB7bs5T6/Ak d+BLd0MFSgvVk07JEbzKCz42af0lcp88s+gIbamllWjEqfsHikQhYw4/GI6pdE2k2fRe OKMQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id s8-20020a170902ea0800b001c604fdbb14si3892980plg.81.2023.12.01.13.08.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 13:08:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 9083A837BE62; Fri, 1 Dec 2023 13:08:40 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379639AbjLAVIa (ORCPT + 99 others); Fri, 1 Dec 2023 16:08:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229562AbjLAVIa (ORCPT ); Fri, 1 Dec 2023 16:08:30 -0500 Received: from cloudserver094114.home.pl (cloudserver094114.home.pl [79.96.170.134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D96FE10D0; Fri, 1 Dec 2023 13:08:34 -0800 (PST) Received: from localhost (127.0.0.1) (HELO v370.home.net.pl) by /usr/run/smtp (/usr/run/postfix/private/idea_relay_lmtp) via UNIX with SMTP (IdeaSmtpServer 5.4.0) id 272a710a48396a82; Fri, 1 Dec 2023 22:08:31 +0100 Received: from kreacher.localnet (unknown [195.136.19.94]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by cloudserver094114.home.pl (Postfix) with ESMTPSA id 284286686C5; Fri, 1 Dec 2023 22:08:31 +0100 (CET) From: "Rafael J. Wysocki" To: Daniel Lezcano , Lukasz Luba Cc: Linux PM , LKML , Srinivas Pandruvada , Zhang Rui Subject: [PATCH v2 2/2] thermal: sysfs: Rework the reading of trip point attributes Date: Fri, 01 Dec 2023 22:08:20 +0100 Message-ID: <4555621.LvFx2qVVIh@kreacher> In-Reply-To: <12359903.O9o76ZdvQC@kreacher> References: <12359903.O9o76ZdvQC@kreacher> MIME-Version: 1.0 X-CLIENT-IP: 195.136.19.94 X-CLIENT-HOSTNAME: 195.136.19.94 X-VADE-SPAMSTATE: clean X-VADE-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrudeiledgudeghecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfjqffogffrnfdpggftiffpkfenuceurghilhhouhhtmecuudehtdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvvefufffkjghfggfgtgesthfuredttddtjeenucfhrhhomhepfdftrghfrggvlhculfdrucghhihsohgtkhhifdcuoehrjhifsehrjhifhihsohgtkhhirdhnvghtqeenucggtffrrghtthgvrhhnpedvffeuiedtgfdvtddugeeujedtffetteegfeekffdvfedttddtuefhgeefvdejhfenucfkphepudelhedrudefiedrudelrdelgeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduleehrddufeeirdduledrleegpdhhvghlohepkhhrvggrtghhvghrrdhlohgtrghlnhgvthdpmhgrihhlfhhrohhmpedftfgrfhgrvghlucflrdcuhgihshhotghkihdfuceorhhjfiesrhhjfiihshhotghkihdrnhgvtheqpdhnsggprhgtphhtthhopeeipdhrtghpthhtohepuggrnhhivghlrdhlvgiitggrnhhosehlihhnrghrohdrohhrghdprhgtphhtthhopehluhhkrghsiidrlhhusggrsegrrhhmrdgtohhmpdhrtghpthhtoheplhhinhhugidqphhmsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtoheplhhinhhugidqkhgvrhhnvghlsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtohepshhr ihhnihhvrghsrdhprghnughruhhvrggurgeslhhinhhugidrihhnthgvlhdrtghomhdprhgtphhtthhopehruhhirdiihhgrnhhgsehinhhtvghlrdgtohhm X-DCC--Metrics: v370.home.net.pl 1024; Body=6 Fuz1=6 Fuz2=6 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Fri, 01 Dec 2023 13:08:40 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784115287292818248 X-GMAIL-MSGID: 1784115287292818248 From: Rafael J. Wysocki Rework the _show() callback functions for the trip point temperature, hysteresis and type attributes to avoid copying the values of struct thermal_trip fields that they do not use and to make them carry out validation checks with the help of check_thermal_zone_and_trip_id(), like the corresponding _store() callback functions. No intentional functional impact. Signed-off-by: Rafael J. Wysocki --- drivers/thermal/thermal_sysfs.c | 55 ++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 27 deletions(-) Index: linux-pm/drivers/thermal/thermal_sysfs.c =================================================================== --- linux-pm.orig/drivers/thermal/thermal_sysfs.c +++ linux-pm/drivers/thermal/thermal_sysfs.c @@ -96,25 +96,25 @@ trip_point_type_show(struct device *dev, char *buf) { struct thermal_zone_device *tz = to_thermal_zone(dev); - struct thermal_trip trip; - int trip_id, result; + enum thermal_trip_type type; + int trip_id, ret; if (sscanf(attr->attr.name, "trip_point_%d_type", &trip_id) != 1) return -EINVAL; mutex_lock(&tz->lock); - if (device_is_registered(dev)) - result = __thermal_zone_get_trip(tz, trip_id, &trip); - else - result = -ENODEV; + ret = check_thermal_zone_and_trip_id(dev, tz, trip_id); + if (ret) { + mutex_unlock(&tz->lock); + return ret; + } - mutex_unlock(&tz->lock); + type = tz->trips[trip_id].type; - if (result) - return result; + mutex_unlock(&tz->lock); - switch (trip.type) { + switch (type) { case THERMAL_TRIP_CRITICAL: return sprintf(buf, "critical\n"); case THERMAL_TRIP_HOT: @@ -175,25 +175,24 @@ trip_point_temp_show(struct device *dev, char *buf) { struct thermal_zone_device *tz = to_thermal_zone(dev); - struct thermal_trip trip; - int trip_id, ret; + int trip_id, ret, temp; if (sscanf(attr->attr.name, "trip_point_%d_temp", &trip_id) != 1) return -EINVAL; mutex_lock(&tz->lock); - if (device_is_registered(dev)) - ret = __thermal_zone_get_trip(tz, trip_id, &trip); - else - ret = -ENODEV; + ret = check_thermal_zone_and_trip_id(dev, tz, trip_id); + if (ret) { + mutex_unlock(&tz->lock); + return ret; + } - mutex_unlock(&tz->lock); + temp = tz->trips[trip_id].temperature; - if (ret) - return ret; + mutex_unlock(&tz->lock); - return sprintf(buf, "%d\n", trip.temperature); + return sprintf(buf, "%d\n", temp); } static ssize_t @@ -243,22 +242,24 @@ trip_point_hyst_show(struct device *dev, char *buf) { struct thermal_zone_device *tz = to_thermal_zone(dev); - struct thermal_trip trip; - int trip_id, ret; + int trip_id, ret, hyst; if (sscanf(attr->attr.name, "trip_point_%d_hyst", &trip_id) != 1) return -EINVAL; mutex_lock(&tz->lock); - if (device_is_registered(dev)) - ret = __thermal_zone_get_trip(tz, trip_id, &trip); - else - ret = -ENODEV; + ret = check_thermal_zone_and_trip_id(dev, tz, trip_id); + if (ret) { + mutex_unlock(&tz->lock); + return ret; + } + + hyst = tz->trips[trip_id].hysteresis; mutex_unlock(&tz->lock); - return ret ? ret : sprintf(buf, "%d\n", trip.hysteresis); + return ret ? ret : sprintf(buf, "%d\n", hyst); } static ssize_t