From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CA620CD8CB9 for ; Wed, 10 Jun 2026 10:21:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=GQ1CB1xaItZwOeJMb8jfEb8OFmetyjBrvgHBbV+tv7c=; b=iLP25oFZb/91XLGnkQWDbyBhXO C2HVoWh+HAYhIYiQRqAUpIhwN8MP+mUx6ti0/jWrJXdxE6RIacvUlR9wN0SnMgh//1VhuATrP1X// yZly6zR/DWci+tTGGI9fY7e2IVRDl9aToNmNMxEhxrCA8XWWTRG8vFPMhEJ4OkgcAq+DZfaBaF0AO 0FN59Xey1u+yVo0Qfaw8o/5/DuGiVcSGutTsRxE2tCaSlRW0MTfEKmmQXUezgI/6/M/y6LbdMqDqA RQsAZOwXpJXz0/m3wFjzDo+WxgYVniEzcZoPsyzas9+G5iGHNnhDYemc3WBOuq04xd8DSCG1QvEo9 pPwE2BQQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wXG3P-00000007MzR-3mDG; Wed, 10 Jun 2026 10:20:59 +0000 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wXG3N-00000007Mxp-3Iux for linux-mediatek@lists.infradead.org; Wed, 10 Jun 2026 10:20:58 +0000 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-2c0c3184c71so50746685ad.1 for ; Wed, 10 Jun 2026 03:20:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781086857; x=1781691657; darn=lists.infradead.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=GQ1CB1xaItZwOeJMb8jfEb8OFmetyjBrvgHBbV+tv7c=; b=aJVFAc3yhiwP42JCms0UVDsrbvOCYGOrnU2JmlapdxQJpcoa36MgdXiAxRbmuz0A96 d8mAXL4pXll0pUS50HrLQkgLhSDL9wQN/FmEwhiQw9KbLHO1JeQVgJDxz1IV5Y1+YoCQ aoKK5h6twy/272qjk5UQIfw28Lu//rEdMrOwM3UW4DAHVuIBKM7J47YiUgFduEbd2Wtr dpunZN/d429DD3LJwZYepXri18l7EckL98gBfizVJhLMm6GE2ccHzPzGHNQL17YnfeGU Doi+TWAF4IoY6io4lTqsxY+3c9K49Ym5ZhxjGmW+YcAHjaTTjU4+TDttDByJKK7udAFi fXLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781086857; x=1781691657; 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=GQ1CB1xaItZwOeJMb8jfEb8OFmetyjBrvgHBbV+tv7c=; b=qvnJdHof4wvzRpzOXbBN6THBclBOHs8tRnS7m6qJ7WGEcL/hsjMZjjeTHnN9F9Y+wh urUsJ1603G+0HlnCxT+L1C1RX7BkObRSH2Qq2pcYhwrqbFrbyR66sxwHVy/9B6DkdPLV JhDXke4NdnOQo3oaPMVCHcysOA30w045Ypnbh4gHdxuaMAeyPIyFV6S+GmA+EcJoeZJz 7onbK1yLloo7Mg9XtxfbmakxsheooTySeQthO7FsDArTN3rOgbiwHE/os0SD+y1GKXb9 zXJvw2aAmU6gAMVHS4U+4A/vYBCcLW0b/Fe3srnD7FLWVwoqXtSqCs7R08k8w/egCvjY oUHw== X-Forwarded-Encrypted: i=1; AFNElJ8zqdathXonIjRUHgm37D6BkQomx+W9J1wZxnY1lhCFzi9U7lpNh5ZUeSYKHyrQKRpFiA82xvT/wv48cbwuKQ==@lists.infradead.org X-Gm-Message-State: AOJu0YxIIuFGZgv1UpkkVXTCe4DpgzT4E2D10V6TX4bdWER4eNKCvSR3 CV+xPbz5cQUY/EQvyrP5PrianNI8vpwd3cb89SaT0cPVPM9uE9jUUzyj X-Gm-Gg: Acq92OEz2/wVYbxJgOH43EhBb7BvjE+s0UA4xpdAdCF7w/87Y+xbnlcvnN60F3MdjiZ NvdWRb4XuvEDzQ/j/ENkR1YnD5cnAc9b9K379GpRoCagGH4YR8Bjv2oGEIo0OeXdy6kurRKb6AS 5p84lqAmZgJiZJ1j1dQW0vwSgQMHpVtdopyeaUoZRFoe1CZctCzgJRbq8Hgc+jyz2a1tJQ1N/kO z+H6mdwwmKS35ntm8EfOI13a7aMSCBag+w3nSGEVTq6EsoY+r7xvvsDkZBg7RfV6dTX34LX5bVU vckYP2U4munpqmK2C5rKXx78XpmoflQ2FzL9oVUS3yxI9eG6RikfqEIIKrbV6+egdVpKT6/kWE2 51M5eCx3qZlUSLHc8B+BBV5/dVRKbVQgX6VZ+Ylq7e5BRUV5VlbUSLgk2obTX957IwQmgSbBpl/ NzgesypYYQlvndA/QcUUiVZKkFBe8j60Xz3AoGBpQFKvvYGE+YzAXyCTqaMzb7m5nF2lsU X-Received: by 2002:a17:902:c40f:b0:2c2:bd0d:3cfa with SMTP id d9443c01a7336-2c2bd0d3f54mr41954845ad.11.1781086857182; Wed, 10 Jun 2026 03:20:57 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c164f96b3fsm250133875ad.29.2026.06.10.03.20.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2026 03:20:56 -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 04/10] ASoC: mediatek: mt8188: mt8188-afe-clk: Use guard() for spin locks Date: Wed, 10 Jun 2026 17:20:15 +0700 Message-ID: <20260610102021.83273-5-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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260610_032057_837644_147628BF X-CRM114-Status: GOOD ( 12.15 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org 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/mt8188/mt8188-afe-clk.c | 29 ++++++++-------------- 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/sound/soc/mediatek/mt8188/mt8188-afe-clk.c b/sound/soc/mediatek/mt8188/mt8188-afe-clk.c index 7f411b857782..fc6cb3f0469e 100644 --- a/sound/soc/mediatek/mt8188/mt8188-afe-clk.c +++ b/sound/soc/mediatek/mt8188/mt8188-afe-clk.c @@ -301,7 +301,6 @@ static int mt8188_afe_disable_tuner_clk(struct mtk_base_afe *afe, static int mt8188_afe_enable_apll_tuner(struct mtk_base_afe *afe, unsigned int id) { struct mt8188_afe_tuner_cfg *cfg = mt8188_afe_found_apll_tuner(id); - unsigned long flags; int ret; if (!cfg) @@ -315,8 +314,7 @@ static int mt8188_afe_enable_apll_tuner(struct mtk_base_afe *afe, unsigned int i if (ret) return ret; - spin_lock_irqsave(&cfg->ctrl_lock, flags); - + guard(spinlock_irqsave)(&cfg->ctrl_lock); cfg->ref_cnt++; if (cfg->ref_cnt == 1) regmap_update_bits(afe->regmap, @@ -324,32 +322,27 @@ static int mt8188_afe_enable_apll_tuner(struct mtk_base_afe *afe, unsigned int i cfg->tuner_en_maskbit << cfg->tuner_en_shift, BIT(cfg->tuner_en_shift)); - spin_unlock_irqrestore(&cfg->ctrl_lock, flags); - return 0; } static int mt8188_afe_disable_apll_tuner(struct mtk_base_afe *afe, unsigned int id) { struct mt8188_afe_tuner_cfg *cfg = mt8188_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 = mt8188_afe_disable_tuner_clk(afe, id); if (ret) -- 2.43.0