ASoC: codecs: MBHC: Remove useless condition check
Subsystems (4)
PATCH 1/1 ASoC: codecs: MBHC: Remove useless condition check
Remove redundant conditional check and clean code in special headset support functions.
--- sound/soc/codecs/wcd-mbhc-v2.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
sound/soc/codecs/wcd-mbhc-v2.c +5 -9
@@ -1055,12 +1055,8 @@ static bool wcd_mbhc_check_for_spl_headset(struct wcd_mbhc *mbhc) hs_threshold =wcd_mbhc_get_spl_hs_thres (mbhc); hph_threshold =wcd_mbhc_adc_get_hph_thres (mbhc); -if (output_mv > hs_threshold || output_mv < hph_threshold) { -if (mbhc->force_linein == true) - is_spl_hs = false; - }else { +if (!(output_mv > hs_threshold || output_mv < hph_threshold)) is_spl_hs = true; - }/* Back MIC_BIAS2 to 1.8v if the type is not special headset */ if (!is_spl_hs) {
@@ -1149,13 +1145,13 @@ static void wcd_correct_swch_plug(struct work_struct *work) plug_type =wcd_mbhc_get_plug_from_adc (mbhc, output_mv); is_pa_on =wcd_mbhc_read_field (mbhc,WCD_MBHC_HPH_PA_EN ); -if ((output_mv > hs_threshold) && (!is_spl_hs)) { +if (output_mv > hs_threshold && !is_spl_hs) { is_spl_hs =wcd_mbhc_check_for_spl_headset (mbhc); output_mv =wcd_measure_adc_once (mbhc,MUX_CTL_IN2P );if (is_spl_hs) { - hs_threshold = (hs_threshold *wcd_mbhc_get_micbias (mbhc)) / - micbias_mv; + hs_threshold *=wcd_mbhc_get_micbias (mbhc); + hs_threshold /= micbias_mv; } }
@@ -1185,7 +1181,7 @@ static void wcd_correct_swch_plug(struct work_struct *work) }/* cable is extension cable */ -if (output_mv > hs_threshold || mbhc->force_linein == true) +if (output_mv > hs_threshold || mbhc->force_linein) plug_type =MBHC_PLUG_TYPE_HIGH_HPH ; }
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Mark Brown
maintainerQuoted 4 lines · Srinivasa Rao Mandadapu
Remove redundant conditional check and clean code in special headset support functions.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: codecs: MBHC: Remove useless condition check
commit: b38892b5b85ae54b7b867313996f967122ede42e
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark