From patchwork Sun Feb 11 19:25:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 771846 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 90B835D752; Sun, 11 Feb 2024 19:27:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707679623; cv=none; b=Esn9JaapGrkqL60HLMxXPw949uWBbZ8Q+4XY2srpWw3hcw41rFc3h0nyqQihe8lgc7m8igrnzlDR49AMWlLbjD3yfsOkjrUfLHO5UZusKaES9OyP6aC3fOfRd7Jm8Ud7/zpR431KHMotMvkjUr2uumryfLpVk6b0r8ItqQHFtlE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707679623; c=relaxed/simple; bh=otkuWVvm1bamfjcnEtbEOSyFP8EnfuLqCzO7ywXASiU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qwgrZO1U4uhSJFJGfQxqMejfl0TRsnJWRkYa73sSiE6iVjOzRqeg94uV5OwcFvRh0AXz18TZpzWs46Ay1Zq7zyBg5dn1NPWeeyBSexsIIsxgKJKDq3K3lzYjOW1JYZHT2LBg7eG2oPDLnq0pf/wP63QLHt+zJk5YKYotMmSVbD0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=J9FAw0wF; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="J9FAw0wF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FE19C43390; Sun, 11 Feb 2024 19:26:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707679623; bh=otkuWVvm1bamfjcnEtbEOSyFP8EnfuLqCzO7ywXASiU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J9FAw0wFebf+qt6eHfoydoqcJj0gBSnHJpCavbJcT6eexnFD17A7xaHEeOHrwsoC8 9wBoWPVkLiB2U6IrTD8n7cQvu9gyjtGM7DFM62ylJnGDH5qpvqVDI4m5XSDcuOotMd vRXcZ727Dlil9GgTWud/Biz/16fewUmdTO/Y2k1T0nW+CklDiZs9XtgkNMODhpcgQ9 m5SyhQ+9lE3heU5Ha69aIRaPjd1rEpTcMPhc0tD2204W+7hoyEiugwRHRisNgYAguz tOtRSCMQAOfQlSHVpL0fpVbvaMYDcgH981GFiZdS1QP4JvGs9dqUVbQfOgbbRDuLMa xqkIC/B53b2hg== From: Jonathan Cameron To: linux-iio@vger.kernel.org, "Rafael J . Wysocki" , Len Brown , linux-acpi@vger.kernel.org, Andy Shevchenko , Greg Kroah-Hartman , Daniel Scally , Heikki Krogerus , Sakari Ailus , Julia Lawall Cc: =?utf-8?q?Nuno_S=C3=A1?= , Cosmin Tanislav , Mihail Chindris , Rasmus Villemoes , Tomislav Denis , Marek Vasut , Olivier Moysan , Fabrice Gasnier , Lad Prabhakar , Dmitry Baryshkov , Marijn Suijten , Marius Cristea , Ibrahim Tilki , Peter Zijlstra , Jonathan Cameron Subject: [PATCH v2 06/14] iio: adc: qcom-spmi-adc5: Use device_for_each_child_node_scopd() Date: Sun, 11 Feb 2024 19:25:32 +0000 Message-ID: <20240211192540.340682-7-jic23@kernel.org> X-Mailer: git-send-email 2.43.1 In-Reply-To: <20240211192540.340682-1-jic23@kernel.org> References: <20240211192540.340682-1-jic23@kernel.org> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Jonathan Cameron Switching to the _scoped() version removes the need for manual calling of fwnode_handle_put() in the paths where the code exits the loop early. In this case that's all in error paths. A slightly less convincing usecase than many as all the failure paths are wrapped up in a call to a per fwnode_handle utility function. The complexity in that function is sufficient that it makes sense to factor it out even if it this new auto cleanup would enable simpler returns if the code was inline at the call site. Hence I've left it alone. Cc: Dmitry Baryshkov Cc: Marijn Suijten Signed-off-by: Jonathan Cameron Reviewed-by: Dmitry Baryshkov --- drivers/iio/adc/qcom-spmi-adc5.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/iio/adc/qcom-spmi-adc5.c b/drivers/iio/adc/qcom-spmi-adc5.c index b6b612d733ff..9b69f40beed8 100644 --- a/drivers/iio/adc/qcom-spmi-adc5.c +++ b/drivers/iio/adc/qcom-spmi-adc5.c @@ -825,7 +825,6 @@ static int adc5_get_fw_data(struct adc5_chip *adc) const struct adc5_channels *adc_chan; struct iio_chan_spec *iio_chan; struct adc5_channel_prop prop, *chan_props; - struct fwnode_handle *child; unsigned int index = 0; int ret; @@ -849,12 +848,10 @@ static int adc5_get_fw_data(struct adc5_chip *adc) if (!adc->data) adc->data = &adc5_data_pmic; - device_for_each_child_node(adc->dev, child) { + device_for_each_child_node_scoped(adc->dev, child) { ret = adc5_get_fw_channel_data(adc, &prop, child, adc->data); - if (ret) { - fwnode_handle_put(child); + if (ret) return ret; - } prop.scale_fn_type = adc->data->adc_chans[prop.channel].scale_fn_type;