From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 BB1CF3DB30F for ; Wed, 10 Jun 2026 10:21:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781086867; cv=none; b=oUaHaHajXxkC3/KjKXpLmDRtGK4nFvy6ZV5Cd/HYuO790OuLwh3KHgw3I/uHzR4TfTNt2a8cSko8VS78XgEI36ZwgQYdgc6Hzl2XdPDbRXE8vCEGnaprgSPPIupwaFZm0WhwjSF18NBTFhXTQHdKcVKhTY419WcQm5A4RvZmez0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781086867; c=relaxed/simple; bh=z2piZvL+mAaTAYZdczqHMzsCaYv/janICW5fPxWoyjA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qlC4OsWnIrHasaD2X5f8LLnTGKlM5nEfbZdF2+IlG8QWXpePgCRVzPYiWSSVGnJUeaGVW0FvkieTSGfs/ewm1fa7V5+NB1DLYuCQ9PfhBa4+bX3ZePmJSSlHGtGc3iT6pX0H+Lb0eSvucZw48NLHniLLno64+y0towqMyG4FhRw= 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=K2IZVRVO; arc=none smtp.client-ip=209.85.214.177 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="K2IZVRVO" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2c0bb4a94b8so55308205ad.2 for ; Wed, 10 Jun 2026 03:21:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781086866; x=1781691666; 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=6PfHdZyZ58+lAvtt9QURTlmXybxBjprQ5FeV+lzJh6Y=; b=K2IZVRVOqj+COv0SbmJ7yk0zYbPidm9/KYimjxAtqCWa0hMtfKdB0+4W92gy82OCek 8wwAx2f2EEw5rUf4RJCqmrh8fmOGcw4pVLWJPVGKel4zIEZdV0Ud0/Upg5y2OTt+FeaQ qAjIImt7thDHlc3NjDjJAqp+Zyz4zhhg0zjJk9dFaiE9JQ7NQnPbvZU8tStDHMgj4a56 wW2KZ57986BpU0/5L73nhxq9G2qb2rnDKUbYpGinDN1lSGb/SLdbz7OTgaw1RiimMx+u BDDdvqAn4SLY4XE7MQkghCePt30kcrYCb+c0gjgTlS+44PauY44s5nCo9W7KS1Qui5KH bHIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781086866; x=1781691666; 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=6PfHdZyZ58+lAvtt9QURTlmXybxBjprQ5FeV+lzJh6Y=; b=mb4KgpVIILjw3vN4mncESBrycZbjHdHvHghZKypxKF7VfTfcNI5qaMI/L2xXkBixG0 FndV5LG4xaH2ChCRH7BrjNHNN0MTK3z53qo7mh7Vs+6alTAcDIwHT/Fap+oJDAuq+VzE Evwf0ZnQWc+EZJdfXiGO8kRSgDC13fEr3XCXeISy4zaqiD865tbMs1Vrai8jBzhubkdW Wxz+MUfE/Gfpbl7FAOXiKzWj617WWM1QIRk7RFPxwY74ZSPdQhrqE3N3oG8hbQDDoiUF IyDd1n9zbnrfgzW9Mx6JvXHRhqB7VviYDJ2bX1R8fCHKqwPGb1Hz8qlHhoYfkvgloU/B bxEQ== X-Forwarded-Encrypted: i=1; AFNElJ8jfwfX447cUzoqMvL4r66XpKSW4wQe5vyVunGILac7v8VZwdlU/GKdgK87uvDfPROt1AS/+dERdonuFeQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yw7UycJVzSZOit6tEsCtE6RVWpCOCQkHu8EikHoSJHY3wpZl8b+ pEglk5Wim9B2dVIWx2BpF9Z4iI4QmdizK6QWCFWMXWkdWlKhnwASMf8a X-Gm-Gg: Acq92OGm+t78JlosOqIVBS3KUq5vn7zN5VpmAoVYr4Qr7V/Gsex+TNjUDOZhEL4vYAd YhNlFaKzXuMNyXhfT6hD4/dtK9oJ2kqpox44U/KVNJe6n9UpP0tw6F3gF2Vhpx2qIFvxFOtwU/z NwpoKssKVc8Lj7mNgO5yfUcAWyISA69DYgsOceHZQzDgDaWrvxjO0L/4Q9n1dA4QHMmQSKNCtRC I7iLuBag8A+uO2GZofk5dHGkDHETITkMkCC0jc9KPPU8vIgN779jhc/sCyrD8j6QFT0rfm9Etg6 UyzyIA74NfJFsdMc7WuSRgYWxzEE0O+rQZM9zm+7O8bHmdJYcp5E73cRJv/j6RhtEyi8gINDsUG ZJw1hPMydFIElQLWoNje3ui60vWA6Ad1kZ1cDMMPOXqnuMz3Wg4vWp0s0HwgKcm/RpF3SLMVnBO Pd8pqiJleRRpDLmfCQ/ozmgdOtXeZGg2mxhq4hQT1G/YdqgVvGrXfpwbM8JBhpGwAw5YZKU3fRA euwOtQ= X-Received: by 2002:a17:903:1209:b0:2c0:c3ac:4ae6 with SMTP id d9443c01a7336-2c1e810b983mr265633925ad.19.1781086866069; Wed, 10 Jun 2026 03:21:06 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c164f96b3fsm250133875ad.29.2026.06.10.03.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2026 03:21:05 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Matthias Brugger Cc: Liam Girdwood , AngeloGioacchino Del Regno , Linus Walleij , Bartosz Golaszewski , Jaroslav Kysela , Takashi Iwai , linux-sound@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, bui duc phuc Subject: [PATCH 06/10] ASoC: mediatek: mt8195: mt8195-afe-clk: Use guard() for spin locks Date: Wed, 10 Jun 2026 17:20:17 +0700 Message-ID: <20260610102021.83273-7-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260610102021.83273-1-phucduc.bui@gmail.com> References: <20260610102021.83273-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 --- sound/soc/mediatek/mt8195/mt8195-afe-clk.c | 42 ++++++++++------------ 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/sound/soc/mediatek/mt8195/mt8195-afe-clk.c b/sound/soc/mediatek/mt8195/mt8195-afe-clk.c index f35318ae0739..618d8400913a 100644 --- a/sound/soc/mediatek/mt8195/mt8195-afe-clk.c +++ b/sound/soc/mediatek/mt8195/mt8195-afe-clk.c @@ -283,7 +283,6 @@ static int mt8195_afe_enable_apll_tuner(struct mtk_base_afe *afe, unsigned int id) { struct mt8195_afe_tuner_cfg *cfg = mt8195_afe_found_apll_tuner(id); - unsigned long flags; int ret; if (!cfg) @@ -297,16 +296,14 @@ static int mt8195_afe_enable_apll_tuner(struct mtk_base_afe *afe, if (ret) return ret; - spin_lock_irqsave(&cfg->ctrl_lock, flags); - - cfg->ref_cnt++; - if (cfg->ref_cnt == 1) - regmap_update_bits(afe->regmap, - cfg->tuner_en_reg, - cfg->tuner_en_maskbit << cfg->tuner_en_shift, - 1 << cfg->tuner_en_shift); - - spin_unlock_irqrestore(&cfg->ctrl_lock, flags); + scoped_guard(spinlock_irqsave, &cfg->ctrl_lock) { + cfg->ref_cnt++; + if (cfg->ref_cnt == 1) + regmap_update_bits(afe->regmap, + cfg->tuner_en_reg, + cfg->tuner_en_maskbit << cfg->tuner_en_shift, + 1 << cfg->tuner_en_shift); + } return 0; } @@ -315,24 +312,21 @@ static int mt8195_afe_disable_apll_tuner(struct mtk_base_afe *afe, unsigned int id) { struct mt8195_afe_tuner_cfg *cfg = mt8195_afe_found_apll_tuner(id); - unsigned long flags; int ret; if (!cfg) return -EINVAL; - spin_lock_irqsave(&cfg->ctrl_lock, flags); - - cfg->ref_cnt--; - if (cfg->ref_cnt == 0) - regmap_update_bits(afe->regmap, - cfg->tuner_en_reg, - cfg->tuner_en_maskbit << cfg->tuner_en_shift, - 0 << cfg->tuner_en_shift); - else if (cfg->ref_cnt < 0) - cfg->ref_cnt = 0; - - spin_unlock_irqrestore(&cfg->ctrl_lock, flags); + scoped_guard(spinlock_irqsave, &cfg->ctrl_lock) { + cfg->ref_cnt--; + if (cfg->ref_cnt == 0) + regmap_update_bits(afe->regmap, + cfg->tuner_en_reg, + cfg->tuner_en_maskbit << cfg->tuner_en_shift, + 0 << cfg->tuner_en_shift); + else if (cfg->ref_cnt < 0) + cfg->ref_cnt = 0; + } ret = mt8195_afe_disable_tuner_clk(afe, id); if (ret) -- 2.43.0