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 BC31A3F0A87 for ; Thu, 18 Jun 2026 11:09:46 +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=1781780988; cv=none; b=Kz48AFH9QzwbxaA97UYJvrrajNRneXPAhwe2bkTCAXa1BD5dnZqm5ZpY+1dVtmdjYJ4cX8fKfaASIUO/eHuNdQTZc3Pvz3aSBNVh9GD+gp5VnOLvjP5iTZlUv2u7RWMgHRS9XpwIKvU9tUv50U4YxzuwGE3wgQE7Aik+mURYHW0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781780988; c=relaxed/simple; bh=2YEFbdla4i9f3SYHqUh0C1+vGlG+s3hBs5AIA/oPVVs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HO2enQqcCp5L7cQXhhS2QLXzTTYAH88e3m2mZQE30Pj+7ATs8D4qJOpVjVufeA9EALn3QBlPen7VzAhmcZuhCfNetIhbUG0iWEvJBYcCbjCSpPNYcgXTvRkJ60qTEfmJboD5+eg0LDbf0jIKQT12+IaRdFRnyRDUAmQ/IzhVCDo= 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=H0adfDTm; 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="H0adfDTm" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2bf3781ca51so7468725ad.0 for ; Thu, 18 Jun 2026 04:09:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781780986; x=1782385786; darn=lists.linux.dev; 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=B+5iMTEe+TMtLaXRee64f4hO5oI+4SkVEwQJjwWAAKo=; b=H0adfDTmtta0D9nYxOte/8rY2rTObNzP90EZKJswS0JVs1hFhwWXFpszJPyIs+EC8B ObipJ0kaVWkv8rHtCu4bNunEU3ryb6mQ2WbAqtT4TLlqVcHLx5gPlw/4nq0qvBgExW61 4+2QWH1uRFA8gLIVKX7yo36RuQXuR2X7YYxnnmdgL0Ks/ntI81Yty0T3HOq3P4DwviZG Lf97gUug2veyigihmgg73sCo3k6M6qCVtLUz5MXfTkvaFcm4inWE98KvH/H/RZNuJ3M2 CbLGVj3iKjcX/KZOEUlqtS3NQ1qAM89/jdRT5XLi1HZXWMNp1W8JNu1tLtEZAEKggoaF w2MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781780986; x=1782385786; 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=B+5iMTEe+TMtLaXRee64f4hO5oI+4SkVEwQJjwWAAKo=; b=mIvpQ2fPZmIswMsomQflO9qCiATX8D2+BTIazt69x+vnpdWk1sZs8LWlek61D1MyVU BziTvtzKQnd1+XvxQC6LVohIEzuQxZbTBDc7xv/o/sX078FHV8ByvqmBnIynMournQjG RsEAoStZY0tdHm/HHmRS+0e6Dj6n3m4488oWfD9u7Ve5BCC0XQTpNBpxMwGK9kokLq6l klE/fcRqgC9MiZwgvqDibTexMiWfiuK74SdcVjr+VJUMT5+YtWflahv1PVwwYEJEpVCI os+AX1f/Y8jQeD6CJLSLS11CoOnkuJVAHaWUi1rtXKE7FSee4V2FKby+PGrpsmCoc9op WWmA== X-Forwarded-Encrypted: i=1; AFNElJ+WVNkBUvDH200k0FpI4l+n9Bu6Y0YaXPds6f25w/p1O0oOdEu0pFUCqjUdqkOswmxMcnGSFg==@lists.linux.dev X-Gm-Message-State: AOJu0YypbwXkfg8U8BwSEE5sVwvl7CcNaNdSKTKZx9vJCEh3SREJsvSg 5IAYEu8IEbQGqHVkLgB9Y1r971XEkbL6eczUN2YRp43qyFIB2Tvi64b0 X-Gm-Gg: AfdE7clNCkKxxORgqkrMcLiBM9ii2PJFFhzrmKIgrhIbxSCqgtIuhplE7Mi0XYNpymB /Jahfrq3TzIJN3LdlDsbq8VZ4QrmpwNO+6sxlqttvO45R+M5w6H1Vr9RJIfb78wk4jOuakt/U6u 5456DZe2Nggvz2fnwICSf2osX7aBWKtt+nSM+9Hi7p0hPe7aUivRq38NBrF6M1WKZs2M7NTeNHr zOQ1xU2LIwOv/UXbIAWjkyzWQsF2JAZfHOBcoD+f2oNpLs+h8iWCN3OYyEK6DDlXl0J7zRHCCNF F+eSw46tcwgJSWZA7fXpzxbTnB2UFtCs2c2a+6p9bKBTh/D6o2Ro7dimdfX0aeyDSKzdGcv1wUo HjKzbkx97wt8mFY5LB7YgBoBFaVYhyZx334L37vnHxC4iBm1WAlZkYNY+D8e2/f6WlI3pj2qz37 gPBpDLlo30ftc3AjLw/NvlPrJ3E28xa1dI2ESWb/3HSJlBlZg= X-Received: by 2002:a17:902:f681:b0:2bf:175a:db61 with SMTP id d9443c01a7336-2c6e471a08fmr36744085ad.7.1781780986069; Thu, 18 Jun 2026 04:09:46 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c42f1f0f19sm196384565ad.10.2026.06.18.04.09.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jun 2026 04:09:45 -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 63/78] ASoC: codecs: wcd-mbhc: Use guard() for mutex locks Date: Thu, 18 Jun 2026 18:08:12 +0700 Message-ID: <20260618110827.232983-7-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260618110827.232983-1-phucduc.bui@gmail.com> References: <20260617103235.449609-1-phucduc.bui@gmail.com> <20260618110827.232983-1-phucduc.bui@gmail.com> Precedence: bulk X-Mailing-List: asahi@lists.linux.dev 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/wcd-mbhc-v2.c | 142 +++++++++++++++------------------ 1 file changed, 66 insertions(+), 76 deletions(-) diff --git a/sound/soc/codecs/wcd-mbhc-v2.c b/sound/soc/codecs/wcd-mbhc-v2.c index bb0c8478a8eb..b8e87d0b79b1 100644 --- a/sound/soc/codecs/wcd-mbhc-v2.c +++ b/sound/soc/codecs/wcd-mbhc-v2.c @@ -419,9 +419,8 @@ static void wcd_cancel_hs_detect_plug(struct wcd_mbhc *mbhc, struct work_struct *work) { mbhc->hs_detect_work_stop = true; - mutex_unlock(&mbhc->lock); + guard(mutex)(&mbhc->lock); cancel_work_sync(work); - mutex_lock(&mbhc->lock); } static void wcd_mbhc_cancel_pending_work(struct wcd_mbhc *mbhc) @@ -458,7 +457,7 @@ static void wcd_mbhc_find_plug_and_report(struct wcd_mbhc *mbhc, if (mbhc->current_plug == plug_type) return; - mutex_lock(&mbhc->lock); + guard(mutex)(&mbhc->lock); switch (plug_type) { case MBHC_PLUG_TYPE_HEADPHONE: @@ -481,7 +480,6 @@ static void wcd_mbhc_find_plug_and_report(struct wcd_mbhc *mbhc, mbhc->current_plug, plug_type); break; } - mutex_unlock(&mbhc->lock); } static void wcd_schedule_hs_detect_plug(struct wcd_mbhc *mbhc, @@ -517,7 +515,7 @@ static void mbhc_plug_detect_fn(struct work_struct *work) enum snd_jack_types jack_type; bool detection_type; - mutex_lock(&mbhc->lock); + guard(mutex)(&mbhc->lock); mbhc->in_swch_irq_handler = true; @@ -578,7 +576,6 @@ static void mbhc_plug_detect_fn(struct work_struct *work) exit: mbhc->in_swch_irq_handler = false; - mutex_unlock(&mbhc->lock); } static irqreturn_t wcd_mbhc_mech_plug_detect_irq(int irq, void *data) @@ -673,29 +670,28 @@ static irqreturn_t wcd_mbhc_btn_press_handler(int irq, void *data) int mask; unsigned long msec_val; - mutex_lock(&mbhc->lock); + guard(mutex)(&mbhc->lock); wcd_cancel_btn_work(mbhc); mbhc->is_btn_press = true; msec_val = jiffies_to_msecs(jiffies - mbhc->jiffies_atreport); /* Too short, ignore button press */ if (msec_val < MBHC_BUTTON_PRESS_THRESHOLD_MIN) - goto done; + return IRQ_HANDLED; /* If switch interrupt already kicked in, ignore button press */ if (mbhc->in_swch_irq_handler) - goto done; + return IRQ_HANDLED; /* Plug isn't headset, ignore button press */ if (mbhc->current_plug != MBHC_PLUG_TYPE_HEADSET) - goto done; + return IRQ_HANDLED; mask = wcd_mbhc_get_button_mask(mbhc); mbhc->buttons_pressed |= mask; if (schedule_delayed_work(&mbhc->mbhc_btn_dwork, msecs_to_jiffies(400)) == 0) WARN(1, "Button pressed twice without release event\n"); -done: - mutex_unlock(&mbhc->lock); + return IRQ_HANDLED; } @@ -704,14 +700,14 @@ static irqreturn_t wcd_mbhc_btn_release_handler(int irq, void *data) struct wcd_mbhc *mbhc = data; int ret; - mutex_lock(&mbhc->lock); + guard(mutex)(&mbhc->lock); if (mbhc->is_btn_press) mbhc->is_btn_press = false; else /* fake btn press */ - goto exit; + return IRQ_HANDLED; if (!(mbhc->buttons_pressed & WCD_MBHC_JACK_BUTTON_MASK)) - goto exit; + return IRQ_HANDLED; ret = wcd_cancel_btn_work(mbhc); if (ret == 0) { /* Reporting long button release event */ @@ -725,8 +721,6 @@ static irqreturn_t wcd_mbhc_btn_release_handler(int irq, void *data) } } mbhc->buttons_pressed &= ~WCD_MBHC_JACK_BUTTON_MASK; -exit: - mutex_unlock(&mbhc->lock); return IRQ_HANDLED; } @@ -768,62 +762,60 @@ static int wcd_mbhc_initialise(struct wcd_mbhc *mbhc) return ret; } - mutex_lock(&mbhc->lock); - - if (mbhc->cfg->typec_analog_mux) - mbhc->swap_thr = GND_MIC_USBC_SWAP_THRESHOLD; - else - mbhc->swap_thr = GND_MIC_SWAP_THRESHOLD; - - /* setup HS detection */ - if (mbhc->mbhc_cb->hph_pull_up_control_v2) - mbhc->mbhc_cb->hph_pull_up_control_v2(component, - mbhc->cfg->typec_analog_mux ? - HS_PULLUP_I_OFF : HS_PULLUP_I_DEFAULT); - else if (mbhc->mbhc_cb->hph_pull_up_control) - mbhc->mbhc_cb->hph_pull_up_control(component, - mbhc->cfg->typec_analog_mux ? - I_OFF : I_DEFAULT); - else - wcd_mbhc_write_field(mbhc, WCD_MBHC_HS_L_DET_PULL_UP_CTRL, - mbhc->cfg->typec_analog_mux ? 0 : 3); - - wcd_mbhc_write_field(mbhc, WCD_MBHC_HPHL_PLUG_TYPE, mbhc->cfg->hphl_swh); - wcd_mbhc_write_field(mbhc, WCD_MBHC_GND_PLUG_TYPE, mbhc->cfg->gnd_swh); - wcd_mbhc_write_field(mbhc, WCD_MBHC_SW_HPH_LP_100K_TO_GND, 1); - if (mbhc->cfg->gnd_det_en && mbhc->mbhc_cb->mbhc_gnd_det_ctrl) - mbhc->mbhc_cb->mbhc_gnd_det_ctrl(component, true); - wcd_mbhc_write_field(mbhc, WCD_MBHC_HS_L_DET_PULL_UP_COMP_CTRL, 1); - - /* Plug detect is triggered manually if analog goes through USBCC */ - if (mbhc->cfg->typec_analog_mux) - wcd_mbhc_write_field(mbhc, WCD_MBHC_L_DET_EN, 0); - else - wcd_mbhc_write_field(mbhc, WCD_MBHC_L_DET_EN, 1); - - if (mbhc->cfg->typec_analog_mux) - /* Insertion debounce set to 48ms */ - wcd_mbhc_write_field(mbhc, WCD_MBHC_INSREM_DBNC, 4); - else - /* Insertion debounce set to 96ms */ - wcd_mbhc_write_field(mbhc, WCD_MBHC_INSREM_DBNC, 6); + scoped_guard(mutex, &mbhc->lock) { + if (mbhc->cfg->typec_analog_mux) + mbhc->swap_thr = GND_MIC_USBC_SWAP_THRESHOLD; + else + mbhc->swap_thr = GND_MIC_SWAP_THRESHOLD; + + /* setup HS detection */ + if (mbhc->mbhc_cb->hph_pull_up_control_v2) + mbhc->mbhc_cb->hph_pull_up_control_v2(component, + mbhc->cfg->typec_analog_mux ? + HS_PULLUP_I_OFF : HS_PULLUP_I_DEFAULT); + else if (mbhc->mbhc_cb->hph_pull_up_control) + mbhc->mbhc_cb->hph_pull_up_control(component, + mbhc->cfg->typec_analog_mux ? + I_OFF : I_DEFAULT); + else + wcd_mbhc_write_field(mbhc, WCD_MBHC_HS_L_DET_PULL_UP_CTRL, + mbhc->cfg->typec_analog_mux ? 0 : 3); + + wcd_mbhc_write_field(mbhc, WCD_MBHC_HPHL_PLUG_TYPE, mbhc->cfg->hphl_swh); + wcd_mbhc_write_field(mbhc, WCD_MBHC_GND_PLUG_TYPE, mbhc->cfg->gnd_swh); + wcd_mbhc_write_field(mbhc, WCD_MBHC_SW_HPH_LP_100K_TO_GND, 1); + if (mbhc->cfg->gnd_det_en && mbhc->mbhc_cb->mbhc_gnd_det_ctrl) + mbhc->mbhc_cb->mbhc_gnd_det_ctrl(component, true); + wcd_mbhc_write_field(mbhc, WCD_MBHC_HS_L_DET_PULL_UP_COMP_CTRL, 1); + + /* Plug detect is triggered manually if analog goes through USBCC */ + if (mbhc->cfg->typec_analog_mux) + wcd_mbhc_write_field(mbhc, WCD_MBHC_L_DET_EN, 0); + else + wcd_mbhc_write_field(mbhc, WCD_MBHC_L_DET_EN, 1); - /* Button Debounce set to 16ms */ - wcd_mbhc_write_field(mbhc, WCD_MBHC_BTN_DBNC, 2); + if (mbhc->cfg->typec_analog_mux) + /* Insertion debounce set to 48ms */ + wcd_mbhc_write_field(mbhc, WCD_MBHC_INSREM_DBNC, 4); + else + /* Insertion debounce set to 96ms */ + wcd_mbhc_write_field(mbhc, WCD_MBHC_INSREM_DBNC, 6); - /* enable bias */ - mbhc->mbhc_cb->mbhc_bias(component, true); - /* enable MBHC clock */ - if (mbhc->mbhc_cb->clk_setup) - mbhc->mbhc_cb->clk_setup(component, - mbhc->cfg->typec_analog_mux ? false : true); + /* Button Debounce set to 16ms */ + wcd_mbhc_write_field(mbhc, WCD_MBHC_BTN_DBNC, 2); - /* program HS_VREF value */ - wcd_program_hs_vref(mbhc); + /* enable bias */ + mbhc->mbhc_cb->mbhc_bias(component, true); + /* enable MBHC clock */ + if (mbhc->mbhc_cb->clk_setup) + mbhc->mbhc_cb->clk_setup(component, + mbhc->cfg->typec_analog_mux ? false : true); - wcd_program_btn_threshold(mbhc, false); + /* program HS_VREF value */ + wcd_program_hs_vref(mbhc); - mutex_unlock(&mbhc->lock); + wcd_program_btn_threshold(mbhc, false); + } pm_runtime_put_autosuspend(component->dev); @@ -1327,7 +1319,7 @@ static irqreturn_t wcd_mbhc_adc_hs_rem_irq(int irq, void *data) unsigned long timeout; int adc_threshold, output_mv, retry = 0; - mutex_lock(&mbhc->lock); + guard(mutex)(&mbhc->lock); timeout = jiffies + msecs_to_jiffies(WCD_FAKE_REMOVAL_MIN_PERIOD_MS); adc_threshold = wcd_mbhc_adc_get_hs_thres(mbhc); @@ -1342,7 +1334,7 @@ static irqreturn_t wcd_mbhc_adc_hs_rem_irq(int irq, void *data) /* Check for fake removal */ if ((output_mv <= adc_threshold) && retry > FAKE_REM_RETRY_ATTEMPTS) - goto exit; + return IRQ_HANDLED; } while (!time_after(jiffies, timeout)); /* @@ -1359,8 +1351,6 @@ static irqreturn_t wcd_mbhc_adc_hs_rem_irq(int irq, void *data) wcd_mbhc_elec_hs_report_unplug(mbhc); wcd_mbhc_write_field(mbhc, WCD_MBHC_BTN_ISRC_CTL, 0); -exit: - mutex_unlock(&mbhc->lock); return IRQ_HANDLED; } @@ -1622,10 +1612,10 @@ void wcd_mbhc_deinit(struct wcd_mbhc *mbhc) free_irq(mbhc->intr_ids->mbhc_btn_press_intr, mbhc); free_irq(mbhc->intr_ids->mbhc_sw_intr, mbhc); - mutex_lock(&mbhc->lock); - wcd_cancel_hs_detect_plug(mbhc, &mbhc->correct_plug_swch); - cancel_work_sync(&mbhc->mbhc_plug_detect_work); - mutex_unlock(&mbhc->lock); + scoped_guard(mutex, &mbhc->lock) { + wcd_cancel_hs_detect_plug(mbhc, &mbhc->correct_plug_swch); + cancel_work_sync(&mbhc->mbhc_plug_detect_work); + } kfree(mbhc); } -- 2.43.0