From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oa1-f52.google.com (mail-oa1-f52.google.com [209.85.160.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 56DE01CAB3 for ; Mon, 23 Feb 2026 00:12:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771805528; cv=none; b=NGf/sXa7OAiE3CJLsL+P6A/7/lKJnOsbXWze4jdmeTj5zagdTegKL/xdfS/alN83Wb6/SzYV7x3WvdCmHr3frQ7EE9mZ/MsgLykC8Aimc7HQUdZ2YJOzuiLs20BeXjeMgMLfGSyt161EKvDGb87D58MIJf4a7N04DPTz2roFVwQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771805528; c=relaxed/simple; bh=8Q5y8U7qqQeIu9CIhdT2hDo15btgbsbWGqFIvIoUBDM=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=HTTiTWuGWKPsKUMiBnWUhf7IwRsyB5y0up8tu35qMOKBroFW/YdTB6PYwgMUuTAzOuWLvRawJEl7RG7sPvJ+8cI6eL1utJwtL+qlEyUBE7TCwdXzW4GXPoogHRQkeCvZ1rj5e55a7jzkVz2M9s29jU1qiciXA6Y32qt/HpSx02c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=X9xzzv/7; arc=none smtp.client-ip=209.85.160.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="X9xzzv/7" Received: by mail-oa1-f52.google.com with SMTP id 586e51a60fabf-414ffb4c0a0so3236790fac.2 for ; Sun, 22 Feb 2026 16:12:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1771805524; x=1772410324; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=f/cjh3P6a7yxOJcaGA1eGYzRpZFWZsrKDRxEVGR8r7c=; b=X9xzzv/72fYyctuKzLyyvXQMtxVQw9h4CR8rvuGExyrFRH6L8oqor1dVrrzvcvMDgL DTHqqfIx60037AmiVUfBOt7jIr1nzWT5gjZxR3uSWgERASYFMLYOOJHr7Yd2dT1C+xDn Z5uTwmvG9v1dV/pPMYEHzoKralsQIVFb1FdZKlttB4XLRjvkR+T346dgqwOnIbHTArq8 8zGsWVwTWdi9oce4+QpmXhjjxmrIP2LIwdOaX+JMJolOcTn8FjdpvEH6cRf9+4Duihbl mFNchiAz8VTyeCt96CLrqPFaRfuly2fJclRIOeIdwD8l3FbLk1OP6Cs1YiqNX4Vc1Zp/ 0Bkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771805524; x=1772410324; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=f/cjh3P6a7yxOJcaGA1eGYzRpZFWZsrKDRxEVGR8r7c=; b=NxesPcuypGoarkBGfZ5szyqcj2KyuF8I8pn4T803z8315I4BGymiKGidzMOG8n9sYx yoa8pd22bEyLvQY8Imc2cVeHYqCPpXTrXGLvfCNevCHus6bVT2KiO1iWYruiXp+9mgYC 9cJfs7Xxdh22PHL41XSvY+cdFf96N22R/BIu2hKriBrPHdo9e8BKbjnannK3/mFxhaU/ lelD/RpJ7npSCVU5BnW/upU78G9OgrSJzW3cla1xCcig2Mu9D7Nxbcul7dm79uylO8SQ BjaSYJE3mHpavoZBE57DGWI1f3DuuvJ++hWAZ6dYaFd+SRpbhwR4BLivhLqY0My23u3d XmhQ== X-Forwarded-Encrypted: i=1; AJvYcCWmRSGmMP/HrDnUtAqAqT4+4JB0T9CAqGQSwTGW2htUDtEaujC6e9hWBzzvt2efwKZx4Hh2IXHe2J9ueWs=@vger.kernel.org X-Gm-Message-State: AOJu0Yx9duyRkexMs5Z2UoPcbg86tRgQ9d9XShvAI4E8rDmNa6S7npXw W8xq7Tm/bBuwIJOoYRd/cbz1nWDZYOJ/uQmQNwzloNM+NcU/OjxsNJyxZSmomEtvJRw= X-Gm-Gg: AZuq6aJSx79idb0IhX4ACFK/11ZjhWIPPRwojBUuGYmmVEXFY7CnXZpdCmpAdSviUR8 iS4+AAgCiPiSr9nP5thBM7W3JLPXPG92ViObiZ+ZNMJrHqQl7kz1wbxGfohv9ooiRgPxfWC2sUW lTPB13bvjeEAHrY1f1frooMvT+FURng/kBWegCslWE7H4/rQH/g5DMhpIpE0okQL3JvKR4Vbkdy NR1+syF5Ws2VTLMTJbw2GQzf4oja3YdvcZU87y0xwuc8HI8TmChlbXvAgsnlRxG9VmP6pq7FjV8 z5J74f9MQggjnoHFT2qq6ZL7PvOKTLVOPn2Bq1IHicrgPtc3WXuzT4aHGs7D1X3aseR4nJiN2FI RqvhAc5JXkhtEsNJBEf0ZY0xvIRATlaydMZhbkNCL/2bwdkbboI36xORVYeryaVaSTgSGr8Jj2j 28HXS/lIk9AcR/8+B5E1EssY9LdxDeIfVwTPLRT+FjeDrATZccaN85ZS+HEUiDuPzXqnBtxzg= X-Received: by 2002:a05:6870:f61b:b0:409:794e:fe9 with SMTP id 586e51a60fabf-4157b1b3fd3mr3557313fac.54.1771805524220; Sun, 22 Feb 2026 16:12:04 -0800 (PST) Received: from ?IPV6:2600:8803:e7e4:500:e37:2309:3937:4469? ([2600:8803:e7e4:500:e37:2309:3937:4469]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-4157ca3df7fsm6409978fac.0.2026.02.22.16.12.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 22 Feb 2026 16:12:02 -0800 (PST) Message-ID: Date: Sun, 22 Feb 2026 18:12:00 -0600 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 10/11] pinctrl: rockchip: Simplify locking with scoped_guard() To: Krzysztof Kozlowski , Andrew Jeffery , Linus Walleij , Joel Stanley , Emil Renner Berthing , Hal Feng , Chen Wang , Inochi Amaoto , Basavaraj Natikar , Shyam Sundar S K , Bartosz Golaszewski , Steen Hegelund , Daniel Machon , UNGLinuxDriver@microchip.com, Thierry Reding , Jonathan Hunter , Heiko Stuebner , Patrice Chotard Cc: linux-aspeed@lists.ozlabs.org, openbmc@lists.ozlabs.org, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, sophgo@lists.linux.dev, linux-tegra@vger.kernel.org, linux-rockchip@lists.infradead.org References: <20260118-pinctrl-cleanup-guard-v2-0-bd36f681bdc0@oss.qualcomm.com> <20260118-pinctrl-cleanup-guard-v2-10-bd36f681bdc0@oss.qualcomm.com> Content-Language: en-US From: David Lechner In-Reply-To: <20260118-pinctrl-cleanup-guard-v2-10-bd36f681bdc0@oss.qualcomm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 1/18/26 12:09 PM, Krzysztof Kozlowski wrote: > Simplify error handling by removing two mutex_unlock() calls with > scoped_guard(). > > Reviewed-by: Heiko Stuebner > Signed-off-by: Krzysztof Kozlowski > --- > drivers/pinctrl/pinctrl-rockchip.c | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c > index e44ef262beec..bbe1cf712965 100644 > --- a/drivers/pinctrl/pinctrl-rockchip.c > +++ b/drivers/pinctrl/pinctrl-rockchip.c > @@ -3640,17 +3640,16 @@ static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin, Filling in some context from the existing code... for (i = 0; i < num_configs; i++) { param = pinconf_to_config_param(configs[i]); arg = pinconf_to_config_argument(configs[i]); if (param == PIN_CONFIG_LEVEL || param == PIN_CONFIG_INPUT_ENABLE) { /* * Check for gpio driver not being probed yet. > * The lock makes sure that either gpio-probe has completed > * or the gpio driver hasn't probed yet. > */ > - mutex_lock(&bank->deferred_lock); > - if (!gpio || !gpio->direction_output) { > - rc = rockchip_pinconf_defer_pin(bank, pin - bank->pin_base, param, > - arg); > - mutex_unlock(&bank->deferred_lock); > - if (rc) > - return rc; > - > - break; > + scoped_guard(mutex, &bank->deferred_lock) { > + if (!gpio || !gpio->direction_output) { > + rc = rockchip_pinconf_defer_pin(bank, > + pin - bank->pin_base, > + param, arg); > + if (rc) > + return rc; > + break; I think there is an unintentional change here. scoped_guard() is implemented by a for loop. So the break statement is now breaking out of the scoped_guard() scope rather than breaking out of the outer for loop. > + } > } > - mutex_unlock(&bank->deferred_lock); > } > > switch (param) { >