From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 F3F612236F2 for ; Wed, 27 May 2026 10:02:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779876148; cv=none; b=ARK7bm4NBR9jib2E8oZDzsM7xNUO81H5BoceZABJOg4NDUee+DS0v3m8h3+RIkI6iRTxBYvohNeCa0SI2DMnYg6Wk3o4tMCGJ0zhRHsZUe+Xh0jvCn9yZgh8Gpal2STjMhPOKatJBdWC/oSeaaBDiH48L92WmK117Rn7BXzf5BI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779876148; c=relaxed/simple; bh=Bjf7hN3TI8rBFo86J3VB/I2bXgASxc3O0HsCfJhlguc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e3VczUulldJ2DAM5WfhRXop88rm8jBvOvWY38s4BM2ntbRh2CJnUw2woudZJm8pEZMKO0Z40Cg3PZf5wKwW6wpvU9e25Mj05BcOOUnpnMbQmou8Dz+5rNjBrg241b05GYV0IVlJpvcIM1dxx0yYF8LJdS7xWTQfOnO9JqW/6VGg= 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=M3PRau80; arc=none smtp.client-ip=209.85.216.51 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="M3PRau80" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-36af4b7840aso2036439a91.3 for ; Wed, 27 May 2026 03:02:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779876146; x=1780480946; 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=llv9eK39iuv/ZdjHyRDnfcx6/aCeoNvT9KJ0UUI6ILE=; b=M3PRau80geVT2mfplxY45WSmjg6LeCfLv7puXYaEKwupkrD4ArgqcFuVOBDje1EXzm IbbbWNqTFBgb3D6rLW7E3DCek4wg38rgbWkFJdsEj/XRC1EBr3c9a1eq1Kr/AjWLekTb 98jetiKFPId71et80qMOlZaKV27/fxJHTvsAHqYJOD4GMDyVreEdm+IstHiJSbmWcTA5 7tFYVasYIp5SUdcCk9p80PqkRBrkqQ7XvhD8CrJZyS/crhqLCEfIVzOfHWqtq0yWVE1F dqx+8zuKlPwEtAW7PRJJOdebnxJTQco7LCRk9fewYR1X1LPwzkvqR+q0AracOgzcqZYJ 4QjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779876146; x=1780480946; 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=llv9eK39iuv/ZdjHyRDnfcx6/aCeoNvT9KJ0UUI6ILE=; b=L+wHoH2Jv3B8JfsqdV5U7vbjuq3nXFVpH20LX5YVBZJwaZTnGFryFSfEnMpGCJs5KP XWsTs4KKhKxMnA7wvhSh8Ei7Gew8k4muFnGYPh9ElLc4e9RV+BdjSfwrP4Qx/NIELXNZ eevwuZwcLwj7qnQu8UfwjoCbM1XdItOUCmiXpv+i22dS7BfNwQIC88OPPE2r5W14KIHW /POOAdabUzFM1Usb6QF9VmQiuMHt95ZZCSTfMcnH3J7ZmzlbwInzovIEYEJIBbtbhQR9 jj2ZgaUVg//JHNEz/nZZ5S2dZs9NqBZnm0InxCoORb9DRGyNUjrJS0ZyrRojwhSxcBFc R78g== X-Forwarded-Encrypted: i=1; AFNElJ8pVyxo5zHLm/mZILc42bOuQZrRquzfyTmkprnhb5izCseNCA/uZfWPgx3OPzVOthgixcsmkqsrhT7yYOg=@vger.kernel.org X-Gm-Message-State: AOJu0YxHBuNBs9tYGzwPh+zfXqVQW9Xsdq97+wPIbdnJnJfFiAZJHwO3 EXKZfHXawl4JLx38Ts/lWthCq5DyD84+aBgOHdUlSKQ1sdQT9ASGas9NQd6Lqg== X-Gm-Gg: Acq92OHNKTWXjBqs9UiOksfl5uN44rq44vBDxdp8lks+oWtvuvxk93k5i82VBognxD1 fQ0N+fgSqMcJoAlwgCQ9aroez3hVmNmZySX/CHp0tVK6zEe04p5SLCJIAuSjgJIzuSEPo3p60J2 BCDAY8uH3pgmk2xZxKc7j9xC+8FhKBFhEdiuBU3Oyld9XjT/D8W5xH8wC0nasv9rWIbEmpPP35B TblAO+dF6BYeJMTbO42UdNpJxd7Pv0VGT6LjRcWWoeE4S2sVEeeiKCe7MbREW7tACFnZrxGwT2r cUffS6WtvdUL+dV1u3aDJPYLjEINqBFPLccYXc/NhGqU6zYeg7oEZJHFSstxjtEUSp0dOXFimg9 ytfm6BB1PsUFfZjMAe276B/tVL4gK9gomkTYqkTZ5RqdyibS8JCfBY3bsiOI9gprqsY+rwSb73u 6ySI/whit2580S9dHFEFtpwco9anAgZgjO1YR3soxCN8Q1Y5l1/EqwUe7XCw== X-Received: by 2002:a17:90b:1d47:b0:35f:bb33:d728 with SMTP id 98e67ed59e1d1-36a67452011mr22584002a91.11.1779876146159; Wed, 27 May 2026 03:02:26 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c85202902b1sm12205631a12.6.2026.05.27.03.02.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2026 03:02:25 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Arnaud Pouliquen Cc: Liam Girdwood , Jaroslav Kysela , Takashi Iwai , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, bui duc phuc Subject: [PATCH 1/2] ASoC: sti: uniperif_reader: Use guard() for spin locks Date: Wed, 27 May 2026 17:02:05 +0700 Message-ID: <20260527100206.26788-2-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260527100206.26788-1-phucduc.bui@gmail.com> References: <20260527100206.26788-1-phucduc.bui@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 From: bui duc phuc Clean up the code using guard() for spin locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc --- Compile-tested only. sound/soc/sti/uniperif_reader.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/sound/soc/sti/uniperif_reader.c b/sound/soc/sti/uniperif_reader.c index 05ea2b794eb9..45d7613f595c 100644 --- a/sound/soc/sti/uniperif_reader.c +++ b/sound/soc/sti/uniperif_reader.c @@ -46,15 +46,16 @@ static irqreturn_t uni_reader_irq_handler(int irq, void *dev_id) struct uniperif *reader = dev_id; unsigned int status; - spin_lock(&reader->irq_lock); + guard(spinlock)(&reader->irq_lock); if (!reader->substream) - goto irq_spin_unlock; + return ret; snd_pcm_stream_lock(reader->substream); if (reader->state == UNIPERIF_STATE_STOPPED) { /* Unexpected IRQ: do nothing */ dev_warn(reader->dev, "unexpected IRQ\n"); - goto stream_unlock; + snd_pcm_stream_unlock(reader->substream); + return ret; } /* Get interrupt status & clear them immediately */ @@ -70,10 +71,7 @@ static irqreturn_t uni_reader_irq_handler(int irq, void *dev_id) ret = IRQ_HANDLED; } -stream_unlock: snd_pcm_stream_unlock(reader->substream); -irq_spin_unlock: - spin_unlock(&reader->irq_lock); return ret; } @@ -355,12 +353,10 @@ static int uni_reader_startup(struct snd_pcm_substream *substream, { struct sti_uniperiph_data *priv = snd_soc_dai_get_drvdata(dai); struct uniperif *reader = priv->dai_data.uni; - unsigned long flags; int ret; - spin_lock_irqsave(&reader->irq_lock, flags); - reader->substream = substream; - spin_unlock_irqrestore(&reader->irq_lock, flags); + scoped_guard(spinlock_irqsave, &reader->irq_lock) + reader->substream = substream; if (!UNIPERIF_TYPE_IS_TDM(reader)) return 0; @@ -386,15 +382,13 @@ static void uni_reader_shutdown(struct snd_pcm_substream *substream, { struct sti_uniperiph_data *priv = snd_soc_dai_get_drvdata(dai); struct uniperif *reader = priv->dai_data.uni; - unsigned long flags; - spin_lock_irqsave(&reader->irq_lock, flags); + guard(spinlock_irqsave)(&reader->irq_lock); if (reader->state != UNIPERIF_STATE_STOPPED) { /* Stop the reader */ uni_reader_stop(reader); } reader->substream = NULL; - spin_unlock_irqrestore(&reader->irq_lock, flags); } static const struct snd_soc_dai_ops uni_reader_dai_ops = { -- 2.43.0