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 7203139BFF2 for ; Thu, 23 Jul 2026 04:55:07 +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=1784782521; cv=none; b=akMXldJIQFY7w1mPmaa/m2H151jZOe/9fdEMetEofcoxhCALB982opTplS6Qd7KZnx1Z6Dfnq+eB5oErHR/Qjkil3VNCr4yWVc+qZbXwUE6JBwRnTnK3aPc+sKapd7+7TvzT5Yvx4WuN3VRZxiblNJvD/E8bYQC3vibVi388Wos= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782521; c=relaxed/simple; bh=hc/OudOAJizkuq/tPHPl3KLl2IsjBuawl6/ZkFlthW4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jGm7OkfkJYzDIIZdgDqTPlwhl2l6d1zBAq7mYG4WyoUw/FnzZn2ka8b0AT+bhGzENUxDqKNfSaDAINCQ8liFV6fYnFtEVHGm7cgUsgKEe6u6Naxh/rEl8n3hXseqKfMClPYV2bWHZUh+f2QuQgI+4tfvKPpEBT7NyRdXXJIyKo4= 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=D8sYc1Qc; 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="D8sYc1Qc" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2caced6038eso580775ad.0 for ; Wed, 22 Jul 2026 21:55:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782504; x=1785387304; 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=yDs90EL5tDIcZCjfhXzWzxz6QJUAxk7BYmfEQH08RuU=; b=D8sYc1QcmcZd+BXBYE2foridd4Q1zuTboKfDiu3v6gJRy7RmcINPTrb0VIEqoWzZxR 4GC18mtmf7Znil760E+mNeHWNpi9p0RwC6/oPgglzWyQYqvcQ2z+ZU4Lqyh8Enycfmnb yKppcxl55kMK7wl92ma14s459KVqJSe240grdlxO1M/h82N7pK8HffifUvBzuW0zjMlB dxNnKf8v261/Sfhwe5XReozLNceptO7v4iceWdQgYam4BwYbDKj1pN8kI/7COD+egZnm PAAkqd9pODr3RrsiIONPyMjGUegQcD/ESDhcBG08xI9xY2X8mEapDM78v5wRayUOkBmr u7jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782504; x=1785387304; 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=yDs90EL5tDIcZCjfhXzWzxz6QJUAxk7BYmfEQH08RuU=; b=dEn3mXOIPWj2UrbDyDDjtiBSn9uop6w1Nrxz0IYxBmdeFO2v189rBoWo1xscMPksNi J5ru7IkPGImU4XCpj0o8F0yEkGzVPAsi07malt5xmmjR3t47uTCk28sqFQlWOLNQn3Rz OZeY0o2NTlb20Pkufs8eES87Jxuwc7vkCz3kXyE4TEMsG1UHWOrfbo527hJPaosghNp7 weTNxEsiBzkzf9LwD7VE11et6WW4+cpNxyNzny2bsNXmmnh179fDi4VQfipc/W8yTOAw fXOBZLqpNfTKgDWEBYjj0rtOKqE3zHrbKQ/qfJPEx4zaVS+joNvad0sW7X5KDgGfRuik YlyA== X-Forwarded-Encrypted: i=1; AHgh+RqV6prDtitCjH/WFx6tF1yApNepKRPgvo/tHp2mZZpNAHvqS/uCDVSrPZjihjgUc6yrb3BGJlOF0X/UVEs=@vger.kernel.org X-Gm-Message-State: AOJu0YyaRWGE57CrEddtl9KQL9+EQW/gxS9O43lgEtq4Tfhr4Os5AWO7 F3FIIlkJpoC9Br41CYMwJx9Wv/RSSIJeo5F1tB2TL25649dW2mOfhoRP X-Gm-Gg: AR+sD13IW2d3KgUD0JIj68qZVW/zH1apUFfGsUWiQ3eCWVqbH4shlCAl+D4iyTEGgn2 mhlYO0uYUH0W6N8sjML8JrPR+s9oQpKCKUcSa0PWQM1E4rnuZFt6NNDOiBLKvVxZhpNOrdhr9op L+2fg4ovv0WTmb/NOv++0PUd2CIAfmB9Gxfy8HHQmSXtTdmkpYI2uvbtLYI3ZdUBpW33fY0hHhY Oe1Gb5MMZhwQL8eQER79hKNzuUr1Lr3ZTQ1DWy3tF+aHiVG8hMsu1tTqI2pAfVHZSQ20SrUtxcV Zh6imjHoRL6xhb5UCdr7FDQZp5xtoGZmT93q+AOFhyN6tZOUxZIq+uSl9nlycTKR8oIG8qomac/ plLYUMI8+KMj9iJ/zEx/ZsgeJxam41VGsSSYpE8ZDpTnZajaZYzaqDyT4zZ4KxLLyQ7O1UX6wtH 0WjJrOD96RVmKRwgDc708S0qXNsqQbE4oF+jED X-Received: by 2002:a17:903:1aa6:b0:2ce:b3cd:7539 with SMTP id d9443c01a7336-2cfa9476c25mr12872455ad.6.1784782503648; Wed, 22 Jul 2026 21:55:03 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.54.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:55:03 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , nuno.sa@analog.com, Shenghao Ding , Kevin Lu Cc: Baojun Xu , Sen Wang , Steven Eckhoff , Srinivas Kandagatla , Kuninori Morimoto , Charles Keepax , Linus Walleij , u.kleine-koenig@baylibre.com, Thorsten Blum , Kees Cook , Chen Ni , Bartosz Golaszewski , Shengjiu Wang , Sebastian Krzyszkowiak , Pengpeng Hou , Richard Fitzgerald , patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, bui duc phuc Subject: [PATCH 11/26] ASoC: codecs: wcd-mbhc: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:12 +0700 Message-ID: <20260723045327.28260-12-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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/wcd-mbhc-v2.c | 140 ++++++++++++++++----------------- 1 file changed, 66 insertions(+), 74 deletions(-) diff --git a/sound/soc/codecs/wcd-mbhc-v2.c b/sound/soc/codecs/wcd-mbhc-v2.c index bb0c8478a8eb..1b7d481e5132 100644 --- a/sound/soc/codecs/wcd-mbhc-v2.c +++ b/sound/soc/codecs/wcd-mbhc-v2.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only // Copyright (c) 2015-2021, The Linux Foundation. All rights reserved. +#include #include #include #include @@ -419,9 +420,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 +458,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 +481,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, @@ -673,29 +672,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 +702,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 +723,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 +764,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 +1321,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 +1336,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 +1353,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 +1614,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