Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (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 44ADC2820C7 for ; Wed, 10 Sep 2025 19:59:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757534400; cv=none; b=iVVKkawHXgdobpcwRRAqZqU6CZzphvg25wJ7O5hqgttqm5olqL4bJ09Y7Y16MthluPEZSuyMKIFb/Lm1btD5/Qstv7qNYdYcLZUkK0+jPRQIBm7F23RL/MCs79ztPNZpwOuAXF6NYLHpn91CGHXhpLLDrq1IHHozSYd2Dixclg4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757534400; c=relaxed/simple; bh=uBXOGlCMnQlsjVVSJTHl0fyM5k1HHTXNsd7ZIyoRfFk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=WuXhYG1/HAoMW/6ruH9f/7BGjd2B6KzVTFpRjKC9TJ/LC+GNMBUkzW+voCEmjVHfLpSYiKpEFtGG9G3vtyqrcZ35hygaZKGha4hgnnfbazeUlkkQE7mjiZozY9Iru2jaB862agwq2BMGox2IyhANPgoiwjTm7rddC1+kfEvvzQI= 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=f6vpSGTo; arc=none smtp.client-ip=209.85.221.41 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="f6vpSGTo" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-3df35a67434so6417f8f.3 for ; Wed, 10 Sep 2025 12:59:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757534397; x=1758139197; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ng6TDWf6XlZYiajdaz3TZ112Ah6XVvc29LELuzSu4Wo=; b=f6vpSGTo1ufZzZA3r7oDXpt2IsxKbBrA9FmVLAF2NX7NrRaFBE/apToMKKHuEAQa6Q YrsaH1wGLWdex4rZzxji0apv8Nlap3GNKXR+Ux5+QepftIMQoy2zfGVOAciXKUvjEO+x reNvaOy+UDiVD2pJXRsIZIMw+MAkVBnnmPeZY/ib+YmaK8Mq21jUhVFU3IXWxV7q7+pL O1YSBMdu35tLSRpvKARWZPn7YaPV1fftFidKlzFdzwsgrdEprHxV6Ht+KLvp+yPh5D83 G7zIOny9V/PQ4IPeJoYZBeyUCYDmvEQIuic/UYfHJr85xmpUxEPCvAv3Sko6ElAxY1Br KG3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757534397; x=1758139197; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ng6TDWf6XlZYiajdaz3TZ112Ah6XVvc29LELuzSu4Wo=; b=EeDV6xqzxmvoQVS5mYSLC/aziBuHpxSw+kjtc+E7TAl7jouyVj8hITb6Y8TgSkdiCD pcoC3DWwY2LQTS7lBBrqtDqMpUWHsRA3FxudSbrmCVB0QjVn8CMlgawMlCtx2vis5plR V2X7fZk3EF+0+FiVioY0dhnS6/1ScuEQrYm+3EyIfug/D8jv2Zl1SmEAyOfv02JjadHe cZeaHqujtWaBMhMJoaY3g4HrN1F6a91blQh38C9zk0zmBfBqM0i9PqkL4M01z4C1bQgy qdBS9eVX3xwtwPopMCe7sLJe/wcS9vcJggaDpr3Qa1ycb2cJ4BmbgfPB9/tUiza/2uWJ PlOA== X-Forwarded-Encrypted: i=1; AJvYcCVHR21EGIq/ziT8VNlPiDAFXExXE11mnFZzUMP83eY+ss8oSymmRMdXIZsxDBDGeuUW8r7bccOqqJc=@vger.kernel.org X-Gm-Message-State: AOJu0Yyr8P8rMrzxj8Z8aob8KLhZF0CbLMSkWkluvIrGRHb2d1P+stwr f2t28QsrxOyJnBz8KZW84c8XjaDz+OUiRoP5G1ZflGqjmhJEDS7L8hpa X-Gm-Gg: ASbGncs4u5U7le/MnVSjI9qWNPXxGd8W4Y5I2Og0YZNtg2K+76Ulfou5Yd1ewOKvp9D AUjgALB9pNn4Gfp8yVEQkwx5fFEIUBYX2u/Dn2jGMwRZz7y1ImNxJaRhcEQyF0VEasWZ3jhlsvh xu5pF5r4+FdNIth16e1LAieWuZMMivncRquIy3ivMCJPLs/KlrdoxgI+lzqiaonOIpF0QYPpHGX exoyU4mM/C0OwIgNH/X4Ml65a+u345QRtg/07TXYm8D+OfVILNp2MfDsRxXfOene86mc0JTLP02 2Btw5pVT85nCdheGCIaUb6rF2xWvpHcdzw7MKq+bCdCK0il8tz9zeBCMk8AliXpBmJMXXoBMkGb ZwFKxkihKp+y+tLFYKna8KOrr8i4c X-Google-Smtp-Source: AGHT+IEUZwFaC1J2bBuG5ahfJdmOHm77RmnVlTVKmGXWf2OqqxuOZ7IqccrUBn6fCuTpw/09PVWvQw== X-Received: by 2002:a05:6000:2084:b0:3e6:4b2:b9bf with SMTP id ffacd0b85a97d-3e6426e265cmr13549939f8f.24.1757534396405; Wed, 10 Sep 2025 12:59:56 -0700 (PDT) Received: from pc.. ([105.163.1.135]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3e75215c51csm8086771f8f.0.2025.09.10.12.59.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Sep 2025 12:59:55 -0700 (PDT) From: Erick Karanja To: broonie@kernel.org Cc: julia.lawall@inria.fr, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Erick Karanja Subject: [PATCH] spi: Replace lock/unlock patterns to use guard Date: Wed, 10 Sep 2025 22:59:49 +0300 Message-ID: <20250910195949.273553-1-karanja99erick@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-spi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Replace lock/unlock patterns with scoped based cleanup macro.This simplifies the code control flow. Signed-off-by: Erick Karanja --- drivers/spi/spi-fsl-espi.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index f2f1d3298e6c..eae0fac911de 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -379,9 +379,8 @@ static int fsl_espi_bufs(struct spi_device *spi, struct spi_transfer *t) fsl_espi_write_reg(espi, ESPI_SPIM, mask); /* Prevent filling the fifo from getting interrupted */ - spin_lock_irq(&espi->lock); - fsl_espi_fill_tx_fifo(espi, 0); - spin_unlock_irq(&espi->lock); + scoped_guard (spinlock_irq, &espi->lock) + fsl_espi_fill_tx_fifo(espi, 0); /* Won't hang up forever, SPI bus sometimes got lost interrupts... */ ret = wait_for_completion_timeout(&espi->done, 2 * HZ); @@ -558,15 +557,13 @@ static irqreturn_t fsl_espi_irq(s32 irq, void *context_data) struct fsl_espi *espi = context_data; u32 events, mask; - spin_lock(&espi->lock); + guard(spinlock)(&espi->lock); /* Get interrupt events(tx/rx) */ events = fsl_espi_read_reg(espi, ESPI_SPIE); mask = fsl_espi_read_reg(espi, ESPI_SPIM); - if (!(events & mask)) { - spin_unlock(&espi->lock); + if (!(events & mask)) return IRQ_NONE; - } dev_vdbg(espi->dev, "%s: events %x\n", __func__, events); @@ -575,8 +572,6 @@ static irqreturn_t fsl_espi_irq(s32 irq, void *context_data) /* Clear the events */ fsl_espi_write_reg(espi, ESPI_SPIE, events); - spin_unlock(&espi->lock); - return IRQ_HANDLED; } -- 2.43.0