Unverified Commit 45a3295a authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown
Browse files

ASoC: codecs: wcdxxxx: use sdw_slave_get_current_bank helper 



use sdw_slave_get_current_bank() helper function, rather than duplicating
this function in every codec driver.

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Acked-by: default avatarVinod Koul <vkoul@kernel.org>
Link: https://patch.msgid.link/20250909121954.225833-7-srinivas.kandagatla@oss.qualcomm.com


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

sound/soc/codecs/wcd938x-sdw.c

+0 −10
Original line number Diff line number Diff line
@@ -82,16 +82,6 @@ static struct sdw_dpn_prop wcd938x_dpn_prop[WCD938X_MAX_SWR_PORTS] = { 
	}

};



int wcd938x_swr_get_current_bank(struct sdw_slave *sdev)

{

	int bank;



	bank  = sdw_read(sdev, SDW_SCP_CTRL);



	return ((bank & 0x40) ? 1 : 0);

}

EXPORT_SYMBOL_GPL(wcd938x_swr_get_current_bank);



int wcd938x_sdw_hw_params(struct wcd938x_sdw_priv *wcd,

			  struct snd_pcm_substream *substream,

			  struct snd_pcm_hw_params *params,

sound/soc/codecs/wcd938x.c

+1 −2
Original line number Diff line number Diff line
@@ -1094,8 +1094,7 @@ static int wcd938x_tx_swr_ctrl(struct snd_soc_dapm_widget *w, 
	int bank;

	int rate;



	bank = (wcd938x_swr_get_current_bank(wcd938x->sdw_priv[AIF1_CAP]->sdev)) ? 0 : 1;

	bank = bank ? 0 : 1;

	bank = sdw_slave_get_current_bank(wcd938x->sdw_priv[AIF1_CAP]->sdev);



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

sound/soc/codecs/wcd938x.h

+0 −7
Original line number Diff line number Diff line
@@ -669,9 +669,6 @@ int wcd938x_sdw_hw_params(struct wcd938x_sdw_priv *wcd, 
			  struct snd_pcm_substream *substream,

			  struct snd_pcm_hw_params *params,

			  struct snd_soc_dai *dai);



int wcd938x_swr_get_current_bank(struct sdw_slave *sdev);



#else



static inline int wcd938x_sdw_free(struct wcd938x_sdw_priv *wcd,
@@ -696,9 +693,5 @@ static inline int wcd938x_sdw_hw_params(struct wcd938x_sdw_priv *wcd, 
	return -EOPNOTSUPP;

}



static inline int wcd938x_swr_get_current_bank(struct sdw_slave *sdev)

{

	return 0;

}

#endif /* CONFIG_SND_SOC_WCD938X_SDW */

#endif /* __WCD938X_H__ */

sound/soc/codecs/wcd939x-sdw.c

+0 −7
Original line number Diff line number Diff line
@@ -128,13 +128,6 @@ static struct sdw_dpn_prop wcd939x_tx_dpn_prop[WCD939X_MAX_TX_SWR_PORTS] = { 
	}

};



unsigned int wcd939x_swr_get_current_bank(struct sdw_slave *sdev)

{

	return FIELD_GET(SDW_SCP_STAT_CURR_BANK,

			 sdw_read(sdev, SDW_SCP_CTRL));

}

EXPORT_SYMBOL_GPL(wcd939x_swr_get_current_bank);



int wcd939x_sdw_hw_params(struct wcd939x_sdw_priv *wcd,

			  struct snd_pcm_substream *substream,

			  struct snd_pcm_hw_params *params,

sound/soc/codecs/wcd939x.c

+1 −1
Original line number Diff line number Diff line
@@ -1017,7 +1017,7 @@ static int wcd939x_tx_swr_ctrl(struct snd_soc_dapm_widget *w, 
	int bank;

	int rate;



	bank = wcd939x_swr_get_current_bank(wcd939x->sdw_priv[AIF1_CAP]->sdev);

	bank = sdw_slave_get_current_bank(wcd939x->sdw_priv[AIF1_CAP]->sdev);



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU: