Unverified Commit 6417066f authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown
Browse files

ASoC: codecs: wcd-mbhc: cleanup swap_gnd_mic api 



Remove confusing and unused argument in swap_gnd_mic api, the second
argument active is not really used, and always set to true in the mbhc
drivers.

The callback itself is used to toggle the gnd_mic lines when a cross
connection is detected by mbhc circuits, so there is no need of this
argument.

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://patch.msgid.link/20250327100633.11530-4-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0af2f6be

sound/soc/codecs/wcd-mbhc-v2.c

+1 −1
Original line number Diff line number Diff line
@@ -1260,7 +1260,7 @@ static void wcd_correct_swch_plug(struct work_struct *work) 
			if (pt_gnd_mic_swap_cnt == mbhc->swap_thr) {

				/* US_EU gpio present, flip switch */

				if (mbhc->cfg->swap_gnd_mic) {

					if (mbhc->cfg->swap_gnd_mic(component, true))

					if (mbhc->cfg->swap_gnd_mic(component))

						continue;

				}

			}

sound/soc/codecs/wcd-mbhc-v2.h

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ struct wcd_mbhc_config { 
	int num_btn;

	bool mono_stero_detection;

	bool typec_analog_mux;

	bool (*swap_gnd_mic)(struct snd_soc_component *component, bool active);

	bool (*swap_gnd_mic)(struct snd_soc_component *component);

	bool hs_ext_micbias;

	bool gnd_det_en;

	uint32_t linein_th;

sound/soc/codecs/wcd937x.c

+1 −1
Original line number Diff line number Diff line
@@ -2656,7 +2656,7 @@ static void wcd937x_dt_parse_micbias_info(struct device *dev, struct wcd937x_pri 
		dev_warn(dev, "Micbias3 DT property not found\n");

}



static bool wcd937x_swap_gnd_mic(struct snd_soc_component *component, bool active)

static bool wcd937x_swap_gnd_mic(struct snd_soc_component *component)

{

	int value;

	struct wcd937x_priv *wcd937x;

sound/soc/codecs/wcd938x.c

+1 −1
Original line number Diff line number Diff line
@@ -3230,7 +3230,7 @@ static void wcd938x_dt_parse_micbias_info(struct device *dev, struct wcd938x_pri 
		dev_info(dev, "%s: Micbias4 DT property not found\n", __func__);

}



static bool wcd938x_swap_gnd_mic(struct snd_soc_component *component, bool active)

static bool wcd938x_swap_gnd_mic(struct snd_soc_component *component)

{

	int value;

sound/soc/codecs/wcd939x.c

+1 −1
Original line number Diff line number Diff line
@@ -3215,7 +3215,7 @@ static void wcd939x_dt_parse_micbias_info(struct device *dev, struct wcd939x_pri 
}



#if IS_ENABLED(CONFIG_TYPEC)

static bool wcd939x_swap_gnd_mic(struct snd_soc_component *component, bool active)

static bool wcd939x_swap_gnd_mic(struct snd_soc_component *component)

{

	struct wcd939x_priv *wcd939x = snd_soc_component_get_drvdata(component);