From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (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 8187B37881C for ; Fri, 8 May 2026 06:17:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778221087; cv=none; b=Gqn0bIcxkTWOPfTktHskqQxuicNUIyDHJX6Z1R4F9UFzepVxzjHU+3MYhciQ+gUL2W7jsj3g/qHtkfYypNcd9QBhT7ZsbZVVFJ+Y2iQLcHZP//mQO1NHZ9eDI+MLSvpxOOvgohjQN8jivQygBDzxC+KeNRXA5Tn5dwoWm/oNfPM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778221087; c=relaxed/simple; bh=iAz3jJlPBsba8da3kwjpUIhKKIX2c5o7oUegAZLaLs8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZBItSGE0YRTNXfVgAADJIgHyOzxQm9G3yPWjUxMuS2oFWEV8HJs+VHRp4kGUY14fOkK3sfzAqWYNU8XcTogcn99eyPvLI3FxUcFY3vKcoinbxK4ZBqk8gD37VR84x/d6SIAmtK2i1PewYEx90/ZB7kI5HZHSeXAArqnm58Oh7i4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bZLlb5Xm; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bZLlb5Xm" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-488ad135063so14004515e9.0 for ; Thu, 07 May 2026 23:17:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778221075; x=1778825875; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7/HBkO+y62XsV45mtLzlDevXxl0xhhsA9eRibM5h14I=; b=bZLlb5XmFI5aUFxtUyQJyuZaE3fA3eA3C/SAu+k5kxhItC5EjvAhgAUvCjqJ9kF+NY OzmFlXPYXSCe1jtrSxsLYiu0u7goCAbg1pu3FLUI/nFEgrDwRX3T61Tfx+VJoRWG94QV z/tRN/WsF3ab6LItv1YThZycu9mDO6lmAJ7xWzveADTpHhKJliDuxq21hs2wSb3z0l/N BpQiYVEQpTGvApanGRWRu8NdJd9qDCFrgGGy/rsGD6MxE+hjMjscTPOSvS96PXk5YpB1 gG+j45kP010HTcQ790KDFnIDOXQhxb3rk8VooSS1gQYlmPmt7NO9In6TK0661I1QydKF 3qFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778221075; x=1778825875; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=7/HBkO+y62XsV45mtLzlDevXxl0xhhsA9eRibM5h14I=; b=ZTs9sQbrrGxASzpkY8zGNXDmbYvpEZMe3HoYxyix5S3txVbw5P7z80AIqGrjG9CqFd unCCQmCL6yt74d9qWI16/Bc0KanJAZHX3Lzc6zjfbPtzuCucuubzGtSH8JQQmlPjdD4g 9Eitw3OlxeEBkTifmqpr3QDgvYMi/OkDN/+qECgTn73m/ZgZpEo63k/QXbJr948fUV3Z G5YS9u25BW+WC5ARHBsCKaWBEBuSB2t7mIbBZq57iQq+xdaAeaXml6/xT629WmDhetdp 7a1CnQTlE7EZpx1hUQT/dRIxzgkGNS7SMGlxXUD3wTtr0WEcURl/QZIA1gVTRVlRdk+A mFSQ== X-Forwarded-Encrypted: i=1; AFNElJ/xiEURVR7YCRoPN+osYnuY+yUh6aRZzxeKe1NYghXlva+n/LL3Tb1/i9qomVdednL4xYTQ0gIT7PQ9060=@vger.kernel.org X-Gm-Message-State: AOJu0YyytXRvUJ2HC5/FnnGJ4Pds22LAWYR9KDFDK5jFwTi+NLAW3eVP LdTI++PxAmRLtYdAax8P+IGeRzIpzWpIGd+aJPN0gBoPTKQteh5dJKUo X-Gm-Gg: AeBDiet0slPZef8dDjBiVbtQWInWt1ekyOU7Dq7/PxtQZGHtSffdriHGTfUMUsJlVaq sINFOf8ZatA5ZMLDyRuR/bwu06YSD1lIY4jLEgOpG+guOpaUJmxm0TSH07A39kfOPZpUmr4xNEL TdU9STK9MYEBFlTX5Aw1A5I0QfcSZITIps7zMhj492uTQHnQiRkzqqSSaXbIm2q9nepEXWI5GB+ qYtoanXWrIc+OYYzQfJFJVxXoj2s4iGz1XHZQCwxNuCKebYDJjcA2kePahKIc6mx6bXb40mYrLb 86kzTgtJHrOVoJfm/hCUrFsRhJOg3Z1eCjAoJc1mX/wwv7MKxcpRVd2FfIwtmE3B5wJnxctL2aN TnMImYJPG7aco+euiRQKRFAU32EvD2/a+spughy/sTV1ZefL7rt9bEfNqT8KwI3sRe/V0h3OA0k suSh5W7rXc1+gsI5OdhvASzYI/ow== X-Received: by 2002:a05:600c:3f18:b0:487:2671:fb8f with SMTP id 5b1f17b1804b1-48e51e19668mr170774595e9.8.1778221074930; Thu, 07 May 2026 23:17:54 -0700 (PDT) Received: from ROG ([2a01:e11:202b:40:68b1:8d59:e348:c16e]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e68f5d48fsm11251175e9.14.2026.05.07.23.17.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 May 2026 23:17:54 -0700 (PDT) From: Marco Scardovi To: andriy.shevchenko@intel.com Cc: linux-acpi@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, mathias.nyman@intel.com, mika.westerberg@intel.com, Marco Scardovi Subject: [PATCH v4 4/6] gpio: acpi: use guard(mutex) for conn_lock Date: Fri, 8 May 2026 08:17:27 +0200 Message-ID: <20260508061729.9530-5-mscardovi95@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260508061729.9530-1-mscardovi95@gmail.com> References: <20260508061729.9530-1-mscardovi95@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Replace manual mutex_lock() and mutex_unlock() calls in acpi_gpio_adr_space_handler() with the guard(mutex) helper. This ensures the conn_lock is automatically released when exiting the scope, preventing potential deadlocks and simplifying the logic. Signed-off-by: Marco Scardovi --- drivers/gpio/gpiolib-acpi-core.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/gpio/gpiolib-acpi-core.c b/drivers/gpio/gpiolib-acpi-core.c index e53d68578024..33d6c3b6cdf0 100644 --- a/drivers/gpio/gpiolib-acpi-core.c +++ b/drivers/gpio/gpiolib-acpi-core.c @@ -1123,7 +1123,7 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address, u16 word, shift; bool found; - mutex_lock(&achip->conn_lock); + guard(mutex)(&achip->conn_lock); found = false; list_for_each_entry(conn, &achip->conns, node) { @@ -1155,17 +1155,15 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address, if (!found) { desc = acpi_request_own_gpiod(chip, agpio, i, "ACPI:OpRegion"); if (IS_ERR(desc)) { - mutex_unlock(&achip->conn_lock); status = AE_ERROR; - goto out; + break; } conn = kzalloc_obj(*conn); if (!conn) { gpiochip_free_own_desc(desc); - mutex_unlock(&achip->conn_lock); status = AE_NO_MEMORY; - goto out; + break; } conn->pin = pin; @@ -1173,8 +1171,6 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address, list_add_tail(&conn->node, &achip->conns); } - mutex_unlock(&achip->conn_lock); - /* * For the cases when OperationRegion() consists of more than * 64 bits calculate the word and bit shift to use that one to -- 2.54.0