From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B4D52C3DA7F for ; Thu, 15 Aug 2024 07:22:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=NmpuMWed3wE/MKqQQ30dx9YCUbl3v+yH31472iJ8R/c=; b=hIaYiZmwEMkLZz5qVjYLVNbz91 mo/JiVnBr8RjN9K77tsxGNPY05ZY7S8TjVMZVK0tPzbDLwmWIsfDKTWiFkEi7RN4MBr+BKgQ1WNbH 6/aPjZAhzruRxfaCchGCmrqvW5VULJjdqmMUB2tAzb7/fciLmGzgEwBojjvh8bLJDwkEuSMgOBG3f 2D6QwBn9sjrn3Qpnnv8EuSzuigNMKSybxMFdvzTq7/pqt9EN3Su2xlnIVOmVbe/mD/+vM4wa4IYid +0XhSKQc/IcjSrWx74YE7EKlvtBvcPntrbykFSd8Ji2zy3VTAowa22Pu03fZWxs2hkB4tvh8S+qMb FHNC0PXw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1seUo8-00000009GPA-0QBT; Thu, 15 Aug 2024 07:22:04 +0000 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1seUlf-00000009Fnm-3Ok3 for linux-arm-kernel@lists.infradead.org; Thu, 15 Aug 2024 07:19:33 +0000 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-2d3bdab22b1so456194a91.0 for ; Thu, 15 Aug 2024 00:19:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1723706371; x=1724311171; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=NmpuMWed3wE/MKqQQ30dx9YCUbl3v+yH31472iJ8R/c=; b=BdDJRIAEQ8axdchyDgH+BKyHhh2b2Sgt8fAVsGPG3AouvXkcxl/yp5uEW362Ex4AjW 3dYetcsNaUtOTm+9AdHKNIhbd+Wbo7P7g8QZ/A7hcwCX5jQpwH5ChaMaYTUBVIU3NWYP poCmCpXUHciwcwo3fdSImSPqo0wb8Ldh+u08g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723706371; x=1724311171; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=NmpuMWed3wE/MKqQQ30dx9YCUbl3v+yH31472iJ8R/c=; b=MtExZ47svxbv4TdzI+lmbdw7Cyw6arzjRfT56H2S8ZLPPgAm5jnL9Xd51DnZBWnOKl Dl8d5jh9Tja+1/B3OQC2bg8YvRS+zseQEfRcowGLTxAfR3C8MmVCTa5RBS57an5Ny3C6 f2L5PFars+pQlixd1kZXBQjvHzf95ksp6wjXWZnayGGhgoVpyp8Q9I54dDFD8zeN5OjD kU3bCplbgmNmD6B2Nj4jior9p7snWz3j+WBUBGusBGPjmbgxy0DhMW30sABIWk4VL6AK xepiQJe8iLSc/rnNh6RoV+mDvPEyzrLnwtEBFyPmNi4+Ccr+xYADL3vi/NGfZyazWL/D AfJg== X-Forwarded-Encrypted: i=1; AJvYcCVrBIrKTGANGJ5bVHoM0SVK7Wf6J+tCLFka7fRvDqRXm2fYYxk8ieZ09Tl0BX1mCkz/WNdntOyiYaZxidLXjP6rWd9Btrgvz3JMOUcAakVgDVE76BQ= X-Gm-Message-State: AOJu0Yw4Brt3V6Sgq166u4JgxNwWMdz3iUg5fMpchTBV0LH8P72+atVv s3puIZlY8ezPdt0qoZ1s1kIJ9T7XBa9UaFsyhxAY9GmfOxuQUiCHxCNRze6lgg== X-Google-Smtp-Source: AGHT+IHRshLWXbi6eNNbn2lqpjEggfJMf0Uyu0Go3ioD6E5Am71ibLtxHtFVTG87K3YJW6ZSoF1EvA== X-Received: by 2002:a17:90b:4b12:b0:2d3:90e1:41c7 with SMTP id 98e67ed59e1d1-2d3aab492a6mr6014296a91.31.1723706370866; Thu, 15 Aug 2024 00:19:30 -0700 (PDT) Received: from google.com ([2401:fa00:1:10:745d:58f7:b3cd:901f]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d3c87b0450sm741049a91.28.2024.08.15.00.19.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Aug 2024 00:19:30 -0700 (PDT) Date: Thu, 15 Aug 2024 15:19:25 +0800 From: Chen-Yu Tsai To: Krzysztof Kozlowski Cc: "Rafael J. Wysocki" , Daniel Lezcano , Zhang Rui , Lukasz Luba , Amit Kucheria , Thara Gopinath , Thierry Reding , Jonathan Hunter , Vasily Khoruzhick , Yangtao Li , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-tegra@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev Subject: Re: [PATCH 3/7] thermal: of: Use scoped device node handling to simplify of_thermal_zone_find() Message-ID: <20240815071925.GC350960@google.com> References: <20240814-b4-cleanup-h-of-node-put-thermal-v1-0-7a1381e1627e@linaro.org> <20240814-b4-cleanup-h-of-node-put-thermal-v1-3-7a1381e1627e@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240814-b4-cleanup-h-of-node-put-thermal-v1-3-7a1381e1627e@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240815_001931_872480_85437376 X-CRM114-Status: GOOD ( 23.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Aug 14, 2024 at 10:17:49PM +0200, Krzysztof Kozlowski wrote: > Obtain the device node reference with scoped/cleanup.h to reduce error > handling and make the code a bit simpler. > > Signed-off-by: Krzysztof Kozlowski Reviewed-by: Chen-Yu Tsai > --- > > This depends on my earlier fixes: > > https://lore.kernel.org/all/20240814195823.437597-1-krzysztof.kozlowski@linaro.org/ > --- > drivers/thermal/thermal_of.c | 18 ++++++------------ > 1 file changed, 6 insertions(+), 12 deletions(-) > > diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c > index c8ded4462bb8..fb5472d6ffea 100644 > --- a/drivers/thermal/thermal_of.c > +++ b/drivers/thermal/thermal_of.c > @@ -157,10 +157,9 @@ static struct thermal_trip *thermal_of_trips_init(struct device_node *np, int *n > > static struct device_node *of_thermal_zone_find(struct device_node *sensor, int id) > { > - struct device_node *np, *tz; > struct of_phandle_args sensor_specs; > > - np = of_find_node_by_name(NULL, "thermal-zones"); > + struct device_node *np __free(device_node) = of_find_node_by_name(NULL, "thermal-zones"); > if (!np) { > pr_debug("No thermal zones description\n"); > return ERR_PTR(-ENODEV); > @@ -178,8 +177,7 @@ static struct device_node *of_thermal_zone_find(struct device_node *sensor, int > "#thermal-sensor-cells"); > if (count <= 0) { > pr_err("%pOFn: missing thermal sensor\n", child); > - tz = ERR_PTR(-EINVAL); > - goto out; > + return ERR_PTR(-EINVAL); > } > > for (i = 0; i < count; i++) { > @@ -191,22 +189,18 @@ static struct device_node *of_thermal_zone_find(struct device_node *sensor, int > i, &sensor_specs); > if (ret < 0) { > pr_err("%pOFn: Failed to read thermal-sensors cells: %d\n", child, ret); > - tz = ERR_PTR(ret); > - goto out; > + return ERR_PTR(ret); > } > > if ((sensor == sensor_specs.np) && id == (sensor_specs.args_count ? > sensor_specs.args[0] : 0)) { > pr_debug("sensor %pOFn id=%d belongs to %pOFn\n", sensor, id, child); > - tz = no_free_ptr(child); > - goto out; > + return no_free_ptr(child); > } > } > } > - tz = ERR_PTR(-ENODEV); > -out: > - of_node_put(np); > - return tz; > + > + return ERR_PTR(-ENODEV); > } > > static int thermal_of_monitor_init(struct device_node *np, int *delay, int *pdelay) > > -- > 2.43.0 >