From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f174.google.com (mail-dy1-f174.google.com [74.125.82.174]) (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 67C5B3FB04E for ; Wed, 17 Jun 2026 10:39:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692780; cv=none; b=nNPz38KcKG6492n8hfjSwo/zRAzkWoBpWWLBnZ/3XVOJOxc2xvA2t0lWcN0q3iJMOIP3ZyCyminvSstZVG4ASQXRqt1rIFEnfCvg9GpWN/b1pV2mqEtYrmE8FSfIf8AUoe0P5QJUpkAKRykuA1SU5NXCjgJZ0YevSxz4o0ywMwo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692780; c=relaxed/simple; bh=aKhcyI2WDSo96TltHAbwkDoRWNtxc6VdjCx9GbZVAX4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LToWMNWgzKejNarbe6CNHas8thlO35i1eBIGorR/y5+DHYft9xttR7F0EWEzkd5KeXbCkx71ZgUHzKJ8iaLBHmeCkS50LEykxnGVuDI8dNl8/aBZiir8QxrnJRYfeINKjP6o2plN/dCjWaqnV7c3Os651s+ToX4DXAZPUAoeh/c= 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=ejUq0qht; arc=none smtp.client-ip=74.125.82.174 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="ejUq0qht" Received: by mail-dy1-f174.google.com with SMTP id 5a478bee46e88-30bbe98c3f0so2729780eec.0 for ; Wed, 17 Jun 2026 03:39:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781692779; x=1782297579; 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=8SpJk+YV05owTMk/l4yBZn7d6rPDuNymeMNQ+5MR+ME=; b=ejUq0qht8iceIfsIJO/zswJlm6CoWfX/2qYy5FZmnVMdfO5dJiAdQpzrfTaE3XsNgG jeWxI1XTF8tgyKfTsSX5SEwkCpvUAvk8qtkKxbQ/8biLxNq67PhwLwQ4W8Z/bOQgELR2 HrVr2YLlrXDZ3VasZBlyDy0dCSpqC/eGICCKZ8gv5okJcozbWCTuQ/YTD2yUmW+c4A/Q lQuIpyb/jbtKqNvC2DDMlOVmImOEnIegooPb+w+9rFp33kEw/+sKekJrV53N+9EMeQN8 Hse9zJlvQkvlZ4Pr1s4omxcRtDDD8Hz/RiJsQ79RVjLuSagaDeuYW0/XhD7iN6Aoy95u 70Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781692779; x=1782297579; 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=8SpJk+YV05owTMk/l4yBZn7d6rPDuNymeMNQ+5MR+ME=; b=kzMYR/LhyzjpJ+yuULvh43/wy3nj06RutyO2swCcomaBpU4VVFOTLNtOYKY55Cyxis OPlg/++Io5rY7d+G1ofQR2BLwKWykow3of7oAw6/JqF+Z6OeBJl4+kkm4TujGAQrMQgA mLLMJ8N7BstjBGAy2DWNvdTftzw1Lp/koe/7JcpecxTmYWCFxlQp76tjmovGao9mQyLU ibX8fvqSoMsdW87obwW2fL9MzbXsABYha5FZ9A08iCxwBsRfV+GX8Ye2xjAEYLkmqkwc hNsOtBHmYIuZX7qiHf6vA709ZXPb7uRO6KelvrqfDvijwGBXUUa9kOL/lB3mbf1HzT2i /KNA== X-Forwarded-Encrypted: i=1; AFNElJ/PEm+3+UyQ5vuaekoxHicfUqtx9k2AtzkwFw7kRTkSmsxCOPpajFBDoRf5tEtqu2yYRt6RfjuxDo51vqM=@vger.kernel.org X-Gm-Message-State: AOJu0YzY8M1LME/PpzXGZdcny6/9t5O2axzkh6T2ftT6XUv4TqXJvh+s 6ICzemMQAmS9VWHuXY1Z4SsXbc+yUGt6EAP8s2/sZUWxmRkDmHuCjVZy X-Gm-Gg: AfdE7cmZvjOEqUgYVol1XS8yXAZBxYbdOknIbVmnuR3+VG//jAXIWGLbYehpzsm9GXr Zoip1LGiXs0KUmTexUpDHz67ihTgGVGCtcIIapgYzlFL6Vphnl2+0/BhrbpH+xnoP2tl77jFqjP A4gDaQoDqGDpnWvE1tOXbS6NFHOOVs2yFpL76eyG67vHXbkTKqrXl89WmhTJ6ufmwkcDVpFO41O tRm0enuHPHumRQJXNT2MOAH+Z/pMbf+p0yQ6MRQIANhRYSSx/lv/aqxltOnl4FMb9TMx/7ArZte I6dgjhsBrN1ZudRxT/1jZzIPzOqBeFb5OaekET/4lk+K4ldSom05yQTnQzaqg5LtIY0iYvvhxHn S/OfA+saxMsBKLf2DKq5ahRGUvgAAAL3EdU5tbpJpgngqDiVJxRLlEHt0ebM+5fMGDS36CAMAT1 ZorV5OvgnDcTgXSN9DpAQadLuNSIV/c0ws1U3T1sX3J2gV2Os= X-Received: by 2002:a05:7300:a497:b0:2c5:50fe:c795 with SMTP id 5a478bee46e88-30bca0ed5a2mr1720604eec.29.1781692778532; Wed, 17 Jun 2026 03:39:38 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3081e5d0828sm24616275eec.10.2026.06.17.03.39.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2026 03:39:38 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown Cc: Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Cheng-Yi Chiang , Tzung-Bi Shih , Guenter Roeck , Benson Leung , David Rhodes , Richard Fitzgerald , povik+lin@cutebit.org, Charles Keepax , Support Opensource , Nick Li , Herve Codina , Srinivas Kandagatla , Matthias Brugger , AngeloGioacchino Del Regno , Shenghao Ding , Kevin Lu , Baojun Xu , Sen Wang , Oder Chiou , Lars-Peter Clausen , nuno.sa@analog.com, Steven Eckhoff , patches@opensource.cirrus.com, chrome-platform@lists.linux.dev, asahi@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, bui duc phuc Subject: [PATCH 42/78] ASoC: codecs: rt5645: Use guard() for mutex locks Date: Wed, 17 Jun 2026 17:31:59 +0700 Message-ID: <20260617103235.449609-43-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260617103235.449609-1-phucduc.bui@gmail.com> References: <20260617103235.449609-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 | 161 +++++++++++++++++++------------------- 1 file changed, 80 insertions(+), 81 deletions(-) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 8a9af260e5f7..4a74b90bd3f6 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3325,93 +3325,92 @@ 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); - } - 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; + 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; - } + } - 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