From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f54.google.com (mail-dl1-f54.google.com [74.125.82.54]) (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 E3E7730E83A for ; Thu, 19 Feb 2026 06:46:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771483569; cv=none; b=tmRYqVVGwR7XwxQcUceBbD0cqsik5NJAsCHIOkiKD18dhJEG/BlRxXKepBclkMTHrUAi3H837eHiWGfCdRh0oz7tMFj1x4rSa4NNWZUT9+gz7uT679TDqPy5FwPiHFsQ0DB0yd6qSXnGsrkRd5mlh6pz0823SFIpUcPhLo+CC7k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771483569; c=relaxed/simple; bh=gbwOuCh6UyIObppR+ccmbnKrATlo0fExNZFy0T4F1A8=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=au2DGrb2WmC0y4Z6Nfqw1HNTm09e2hC0Tx/j8ebXokywp9JpnS1ndQG0SH7JEEq241vSo8brxavflO1k06vyW0gKzqveG0eqEh2w2P9uZZCHxc6KEtkviUgu06CDO8bLQDMz5wh0xKOsXFK0pHYXm/FYPexDRb06JexXwnSrYc0= 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=Xsm7JLGX; arc=none smtp.client-ip=74.125.82.54 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="Xsm7JLGX" Received: by mail-dl1-f54.google.com with SMTP id a92af1059eb24-1273349c56bso752518c88.0 for ; Wed, 18 Feb 2026 22:46:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771483565; x=1772088365; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=E70q3Kd5cdh+0sEnkLZNyFfZgY/oE3FN6dtixCcw/1Q=; b=Xsm7JLGXe/J48l1agQgr36zfVIa7DKoW4uiySThf0ditmxQmAs7hyZhQR+gBdIR/DF Jv8QyzwHre52TgPa5LQMA8+Cyt8WXk6opOUOzBRDaSDo+4WB9UpSI0MwsTWYo7ev3I8z g9fgRKYKWKZK2vFSQ6Djd6sYv3k/A0TekZ1a1aOdkznQYviWVv+Diq6YT3IZZTgUch5Y XVu1S1V4AqrFvA5NXKps02p6dAN6GmrT5T3c8ZQkZ6+wsfTjTnNN8nERrEC+1bzSf/7r rPOLlY8Tio9LECAmeOplIL+ndstZGMvviqFmvQNKF6c9QsQNPsnArhoX4Qc1wVCHvLsb NRTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771483565; x=1772088365; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=E70q3Kd5cdh+0sEnkLZNyFfZgY/oE3FN6dtixCcw/1Q=; b=JFAEHQ5++gqbtxnzQm/BB1v2/540aHV8DVcL5WFszrKFjuKdI1rH6EwNe2qdfEEWH4 qmsChRvpbtb4IzAra0YhG9PxI7IfbEuOrzKkscsWZmhWDOUwe5Vd54PvaeqzCGSn3lMx u4K71hpEzpaR+ZYcElq1D5wesgp51Uh+5yiXk8RUKC10MzO+lIBn0qcmZBLcqqRVxOZB xOGSBPFka1TMJm4hpq/TZ3QsAy87+FiiPGjhY/XUtS6vwdVNKm0Kn3JLmFxHyUOzySVg fBCS9P6VQkdwtxDouOLcs50JjtTtPpV68rpSHMTXdtiHZqCs65+KxcYiFzDUPuDv99DR C4Rw== X-Forwarded-Encrypted: i=1; AJvYcCWvcewFRfPXBWD/Phb4x8Lrplm4Fau5Jf+qIzcSGN99goNkQTvVoqWIv3h7iqg2OnPcSDXXB+G5v3CfLUQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzD4nnNA31xDlCG+/R7xJi1HdX4BzcXd5ABsIpyASog4dvOdRL5 NFQEMjaVDxSBh0MVLF51zirqddJlhaaSvF6c5sUlurtqqWqwNxoFWaPc X-Gm-Gg: AZuq6aJXn2cNGFds2QwCel5AhdaVOpqHBPz5SlwjwFgEWdZllgaYpS5fKQ4nMwGOKcd XyUntoRKW72BV6bnhZC9K3ZlauvXcz9dtwysjTrkEAZnaqr2ba8fhZGK/MHtXVeGjrpPaY8ztmw rALAzzIB6HW4FJdwJ3t3uFylsa1RSyrtDIduaFOIEwieiP7DvF0Ybchr2rr2LPSr3QONBP4nNIB UhLr0tHjfCHJ3umNLy8ABCk2jtgAITIbcKfCp0RgjFRx6X+Vh17Uu4zO0yDCvvKweXVRzFs0Pd5 XHh8a20T+uw+zsIibbWxktkdUy5049QJPOM40gra29AQLcZM1HeySX+JA3uOSpZGX54WZVKrc3O XcbFWF8DH6sYq9nSUIbjTdKaTuepgGv6b9IkvPk4MMCi74dcf3qBM1dsJzNhqkUuSwJsAImsLzE QJoXKouHpX4KzyVtJ/DTEurT6O1ZpfcusO42L2BY7e7J+rV+LP4eKu4U8BrTkQWY1v X-Received: by 2002:a05:7022:251f:b0:11a:37a7:3d2f with SMTP id a92af1059eb24-12741bd6599mr7766072c88.37.1771483564618; Wed, 18 Feb 2026 22:46:04 -0800 (PST) Received: from google.com ([2a00:79e0:2ebe:8:265b:f5ad:9e03:677e]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12742aff32asm24395845c88.0.2026.02.18.22.46.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Feb 2026 22:46:04 -0800 (PST) Date: Wed, 18 Feb 2026 22:46:01 -0800 From: Dmitry Torokhov To: Bartosz Golaszewski Cc: Linus Walleij , Tj , "Enrico Weigelt, metux IT consult" , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] gpio: amd-fch: switch to guard() notation Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline guard() is more concise and ensures that lock is released at the end of the scope. Signed-off-by: Dmitry Torokhov --- drivers/gpio/gpio-amd-fch.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/drivers/gpio/gpio-amd-fch.c b/drivers/gpio/gpio-amd-fch.c index 9f329938202b..9b9d75acf35a 100644 --- a/drivers/gpio/gpio-amd-fch.c +++ b/drivers/gpio/gpio-amd-fch.c @@ -48,13 +48,11 @@ static void __iomem *amd_fch_gpio_addr(struct amd_fch_gpio_priv *priv, static int amd_fch_gpio_direction_input(struct gpio_chip *gc, unsigned int offset) { - unsigned long flags; struct amd_fch_gpio_priv *priv = gpiochip_get_data(gc); void __iomem *ptr = amd_fch_gpio_addr(priv, offset); - spin_lock_irqsave(&priv->lock, flags); + guard(spinlock_irqsave)(&priv->lock); writel_relaxed(readl_relaxed(ptr) & ~AMD_FCH_GPIO_FLAG_DIRECTION, ptr); - spin_unlock_irqrestore(&priv->lock, flags); return 0; } @@ -62,12 +60,11 @@ static int amd_fch_gpio_direction_input(struct gpio_chip *gc, static int amd_fch_gpio_direction_output(struct gpio_chip *gc, unsigned int gpio, int value) { - unsigned long flags; struct amd_fch_gpio_priv *priv = gpiochip_get_data(gc); void __iomem *ptr = amd_fch_gpio_addr(priv, gpio); u32 val; - spin_lock_irqsave(&priv->lock, flags); + guard(spinlock_irqsave)(&priv->lock); val = readl_relaxed(ptr); if (value) @@ -77,33 +74,28 @@ static int amd_fch_gpio_direction_output(struct gpio_chip *gc, writel_relaxed(val | AMD_FCH_GPIO_FLAG_DIRECTION, ptr); - spin_unlock_irqrestore(&priv->lock, flags); - return 0; } static int amd_fch_gpio_get_direction(struct gpio_chip *gc, unsigned int gpio) { int ret; - unsigned long flags; struct amd_fch_gpio_priv *priv = gpiochip_get_data(gc); void __iomem *ptr = amd_fch_gpio_addr(priv, gpio); - spin_lock_irqsave(&priv->lock, flags); + guard(spinlock_irqsave)(&priv->lock); ret = (readl_relaxed(ptr) & AMD_FCH_GPIO_FLAG_DIRECTION); - spin_unlock_irqrestore(&priv->lock, flags); return ret ? GPIO_LINE_DIRECTION_OUT : GPIO_LINE_DIRECTION_IN; } static int amd_fch_gpio_set(struct gpio_chip *gc, unsigned int gpio, int value) { - unsigned long flags; struct amd_fch_gpio_priv *priv = gpiochip_get_data(gc); void __iomem *ptr = amd_fch_gpio_addr(priv, gpio); u32 mask; - spin_lock_irqsave(&priv->lock, flags); + guard(spinlock_irqsave)(&priv->lock); mask = readl_relaxed(ptr); if (value) @@ -112,22 +104,18 @@ static int amd_fch_gpio_set(struct gpio_chip *gc, unsigned int gpio, int value) mask &= ~AMD_FCH_GPIO_FLAG_WRITE; writel_relaxed(mask, ptr); - spin_unlock_irqrestore(&priv->lock, flags); - return 0; } static int amd_fch_gpio_get(struct gpio_chip *gc, unsigned int offset) { - unsigned long flags; u32 val; struct amd_fch_gpio_priv *priv = gpiochip_get_data(gc); void __iomem *ptr = amd_fch_gpio_addr(priv, offset); - spin_lock_irqsave(&priv->lock, flags); + guard(spinlock_irqsave)(&priv->lock); val = readl_relaxed(ptr); - spin_unlock_irqrestore(&priv->lock, flags); return FIELD_GET(AMD_FCH_GPIO_FLAG_READ, val); } -- 2.53.0.335.g19a08e0c02-goog -- Dmitry