From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 DB2E948C405 for ; Wed, 8 Jul 2026 14:21:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783520492; cv=none; b=n2Lc7Gb9xjZ/uawtwS8otN2+UhjgbuaL8KMs8zZ0xJWLdWOyz9zdaxgmadRS/CJVUYEdO7RAWIQ75g+T4TJ77xArpzefs4RwSoxJo5ownDfGrQQPrTRiu0sWIf5/K11FKyPYw7/hSbvoyqwW7CVqD6nTx/iazOTn9pyMVbzGUGQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783520492; c=relaxed/simple; bh=vGrtY8X/CBlchJHrZ0QsZ166oJ5xk86uURcTkF4hGPs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D6H+sFRRdcduqfJrXxLOo756pASMPo9kyHiylby8rSaAKL/V98wFAecQUXi/ubYkxmtu+EIE+NPZA9+P2LRGHPEGCPU7H/gGUkMNqCx+X1o2KOZXWppvYgBYRefDTLrV+aulKfnfYVvbsWPyAqGqdfwIs+LTduVrElXsOpEyjMk= 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=Ty8tVTHD; arc=none smtp.client-ip=209.85.214.179 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="Ty8tVTHD" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2cad4170e8eso10204435ad.3 for ; Wed, 08 Jul 2026 07:21:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783520490; x=1784125290; 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:content-type; bh=78eN83RWVPj3usGOOjpXeDQAtr7LkbhNmieBoJ7adsI=; b=Ty8tVTHDxZzRNP36AH+X3BA9J4TuYh6L0xTMaA2R9MxYUUxAHpYY/bkgwP2m4r6xFl 2O7NG89DaGeTLY/5f76uSMRGLE6bIhOE4R/2qf1XvOdIv88B/HXpWGVI6iU3guHOgle6 5iXqZ1DtalSah3h85+C3x6XQFN9C7aLf2hwk/on749ISGvWNfcdI6xn8fcQZeuSVcElP pI/zXiPybcfWEUJKzPvVNcN8xZpwCF+u3PrMETaVdBLTWTFJ7zpvW9cSV8XdmpMRuQLG Ras6lkogmb+0nYExo1OVENqsIT78jLaYSEvaqtJPInoKiIaNc37fKfU10+QnuuEnc4yZ vzUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783520490; x=1784125290; 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:content-type; bh=78eN83RWVPj3usGOOjpXeDQAtr7LkbhNmieBoJ7adsI=; b=Xt+Pr60nS3YDxbISHcDUtm1U+EBNWkPWcyrttFTzxc0NeQVZj6BXKXcvFKAgOROsff SQuRM/TbkMJP7TxbsaN+9RbtJY98ykba1fUIAVdXz/WGymdg8rS6dY32zvIpak7xRpqa 80XNUBu1/l5eiEAozJlpi5XSlcaMXWVUPh7ZPD6QYcgJbCXJwJMUITDLxR1G1/Dg2I5y jwGFtzFjZ5EPpCiScMl486x2ymDo9igQpot6RHA0DMiVqx0k7VAnos0rT/PfwxgV3Vm+ QaO4LQm3ybThn0E/diSM47Dkk/2AysOeG79/hzE0yzLE0Wlzh6bQhQJVp0a5JaKTVByR wGhQ== X-Forwarded-Encrypted: i=1; AHgh+RoSUbKbc7KULvkMaxPBhyxMJ/zboZ89KVNQuAtcRE8Ym4KkBZSUORx0yZOqOrCVyfvasiY1hzG7virkWus=@vger.kernel.org X-Gm-Message-State: AOJu0YwT6+sqklmF+YP03atcavTNFXGf+x/FL8F8/Lgj0vJIHwOGOkme +/L1aNNd3s4KZFx2QvQlJJ7wvNxS72qX0cbiHT9r55tuuKmijVFyX/JX X-Gm-Gg: AfdE7ckOSrMy24oViCil6T+/1CgWOvdd+NqY2IGFuYmDkoqNv/9+hHrXOwd/rfJbuxH cZ+aj4M/lOlVxA1p1KBekuy0+WM7AYyuBd7cn4msTAPXi04tYccld4eQTvg6lqWtr6QbXDuOyyN AbZHpQUwKJ335sXNpCsuTQhC7wjJbv5f5a2DYEBVgtLExPvWPm/xgx4E0me+bXGZ2+lJeV4vwHl kzZ+WVABBoCRUU8Zd+RseDi/YQn+J7QeFHUyVKekEB1JxUrFn+fCzMbYk2nkdgsfuMk6Kgoklty 0Vlxa3aciVhAd6GCftsWZpPhZ3VjyFCY8vlVXePxXPrZvLpoYrhZx+Tj3UifWirfQgDyEs6yAPS cyRerLOhvO4GefB0zI3qqaqjwxeItJ7HE06GffOS6WW+/zc3kYOwZPV4gtswOEuv2552ZZ8lSPi K/P69aeWvYVm1JqS8Br6RkFbE935JGPa/0RQ8CjTXd45twRz8= X-Received: by 2002:a17:903:120f:b0:2ca:53e9:1277 with SMTP id d9443c01a7336-2ccea37df7bmr30296625ad.1.1783520490133; Wed, 08 Jul 2026 07:21:30 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ccc9d3bcc0sm28841575ad.67.2026.07.08.07.21.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 07:21:29 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Takashi Iwai , Nick Li , Herve Codina Cc: Support Opensource , Liam Girdwood , Jaroslav Kysela , Srinivas Kandagatla , Charles Keepax , Richard Fitzgerald , Matthias Brugger , AngeloGioacchino Del Regno , Shenghao Ding , Kevin Lu , Baojun Xu , Sen Wang , Oder Chiou , Linus Walleij , Kuninori Morimoto , u.kleine-koenig@baylibre.com, Zhang Yi , Marco Crivellari , Kees Cook , HyeongJun An , Arnd Bergmann , Qianfeng Rong , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, bui duc phuc Subject: [PATCH v2 18/27] ASoC: codecs: rt5645: Use guard() for mutex locks Date: Wed, 8 Jul 2026 21:17:25 +0700 Message-ID: <20260708141734.578926-19-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260708141734.578926-1-phucduc.bui@gmail.com> References: <20260708141734.578926-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 mutex locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc --- sound/soc/codecs/rt5645.c | 160 +++++++++++++++++++------------------- 1 file changed, 79 insertions(+), 81 deletions(-) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index e9819653b30d..7cdca9774545 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -6,6 +6,7 @@ * Author: Bard Liao */ +#include #include #include #include @@ -3323,93 +3324,90 @@ static void rt5645_jack_detect_work(struct work_struct *work) if (!rt5645->component) return; - mutex_lock(&rt5645->jd_mutex); - - switch (rt5645->pdata.jd_mode) { - case 0: /* Not using rt5645 JD */ - if (rt5645->gpiod_hp_det) { - gpio_state = gpiod_get_value(rt5645->gpiod_hp_det); - if (rt5645->pdata.inv_hp_pol) - gpio_state ^= 1; - dev_dbg(rt5645->component->dev, "gpio_state = %d\n", - gpio_state); - report = rt5645_jack_detect(rt5645->component, gpio_state); + scoped_guard(mutex, &rt5645->jd_mutex) { + switch (rt5645->pdata.jd_mode) { + case 0: /* Not using rt5645 JD */ + if (rt5645->gpiod_hp_det) { + gpio_state = gpiod_get_value(rt5645->gpiod_hp_det); + if (rt5645->pdata.inv_hp_pol) + gpio_state ^= 1; + dev_dbg(rt5645->component->dev, "gpio_state = %d\n", + gpio_state); + report = rt5645_jack_detect(rt5645->component, gpio_state); + } + snd_soc_jack_report(rt5645->hp_jack, + report, SND_JACK_HEADPHONE); + snd_soc_jack_report(rt5645->mic_jack, + report, SND_JACK_MICROPHONE); + return; + case 4: + val = snd_soc_component_read(rt5645->component, RT5645_A_JD_CTRL1) & 0x0020; + break; + default: /* read rt5645 jd1_1 status */ + val = snd_soc_component_read(rt5645->component, RT5645_INT_IRQ_ST) & 0x1000; + break; } - snd_soc_jack_report(rt5645->hp_jack, - report, SND_JACK_HEADPHONE); - snd_soc_jack_report(rt5645->mic_jack, - report, SND_JACK_MICROPHONE); - mutex_unlock(&rt5645->jd_mutex); - return; - case 4: - val = snd_soc_component_read(rt5645->component, RT5645_A_JD_CTRL1) & 0x0020; - break; - default: /* read rt5645 jd1_1 status */ - val = snd_soc_component_read(rt5645->component, RT5645_INT_IRQ_ST) & 0x1000; - break; - - } - if (!val && (rt5645->jack_type == 0)) { /* jack in */ - report = rt5645_jack_detect(rt5645->component, 1); - } else if (!val && rt5645->jack_type == SND_JACK_HEADSET) { - /* for push button and jack out */ - btn_type = 0; - if (snd_soc_component_read(rt5645->component, RT5645_INT_IRQ_ST) & 0x4) { - /* button pressed */ - report = SND_JACK_HEADSET; - btn_type = rt5645_button_detect(rt5645->component); - /* rt5650 can report three kinds of button behavior, - one click, double click and hold. However, - currently we will report button pressed/released - event. So all the three button behaviors are - treated as button pressed. */ - switch (btn_type) { - case 0x8000: - case 0x4000: - case 0x2000: - report |= SND_JACK_BTN_0; - break; - case 0x1000: - case 0x0800: - case 0x0400: - report |= SND_JACK_BTN_1; - break; - case 0x0200: - case 0x0100: - case 0x0080: - report |= SND_JACK_BTN_2; - break; - case 0x0040: - case 0x0020: - case 0x0010: - report |= SND_JACK_BTN_3; - break; - case 0x0000: /* unpressed */ - break; - default: - dev_err(rt5645->component->dev, - "Unexpected button code 0x%04x\n", - btn_type); - break; + if (!val && rt5645->jack_type == 0) { /* jack in */ + report = rt5645_jack_detect(rt5645->component, 1); + } else if (!val && rt5645->jack_type == SND_JACK_HEADSET) { + /* for push button and jack out */ + btn_type = 0; + if (snd_soc_component_read(rt5645->component, RT5645_INT_IRQ_ST) & 0x4) { + /* button pressed */ + report = SND_JACK_HEADSET; + btn_type = rt5645_button_detect(rt5645->component); + /* + * rt5650 can report three kinds of button behavior, + * one click, double click and hold. However, + * currently we will report button pressed/released + * event. So all the three button behaviors are + * treated as button pressed. + */ + switch (btn_type) { + case 0x8000: + case 0x4000: + case 0x2000: + report |= SND_JACK_BTN_0; + break; + case 0x1000: + case 0x0800: + case 0x0400: + report |= SND_JACK_BTN_1; + break; + case 0x0200: + case 0x0100: + case 0x0080: + report |= SND_JACK_BTN_2; + break; + case 0x0040: + case 0x0020: + case 0x0010: + report |= SND_JACK_BTN_3; + break; + case 0x0000: /* unpressed */ + break; + default: + dev_err(rt5645->component->dev, + "Unexpected button code 0x%04x\n", + btn_type); + break; + } } + if (btn_type == 0)/* button release */ + report = rt5645->jack_type; + else + mod_timer(&rt5645->btn_check_timer, + msecs_to_jiffies(100)); + } else { + /* jack out */ + report = 0; + snd_soc_component_update_bits(rt5645->component, + RT5645_INT_IRQ_ST, 0x1, 0x0); + rt5645_jack_detect(rt5645->component, 0); } - if (btn_type == 0)/* button release */ - report = rt5645->jack_type; - else { - mod_timer(&rt5645->btn_check_timer, - msecs_to_jiffies(100)); - } - } else { - /* jack out */ - report = 0; - snd_soc_component_update_bits(rt5645->component, - RT5645_INT_IRQ_ST, 0x1, 0x0); - rt5645_jack_detect(rt5645->component, 0); } - mutex_unlock(&rt5645->jd_mutex); - snd_soc_jack_report(rt5645->hp_jack, report, SND_JACK_HEADPHONE); snd_soc_jack_report(rt5645->mic_jack, report, SND_JACK_MICROPHONE); if (rt5645->en_button_func) -- 2.43.0