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

ASoC: codecs: wcd939x: get regmap directly 



for some reason we ended up with a boiler plate for dev_get_regmap in
wcd939x codec and started exporting a symbol for this. Remove this
redundant wrapper and direclty get regmap.

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


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

sound/soc/codecs/wcd939x-sdw.c

+0 −9
Original line number Diff line number Diff line
@@ -187,15 +187,6 @@ int wcd939x_sdw_set_sdw_stream(struct wcd939x_sdw_priv *wcd, 
}

EXPORT_SYMBOL_GPL(wcd939x_sdw_set_sdw_stream);



struct regmap *wcd939x_swr_get_regmap(struct wcd939x_sdw_priv *wcd)

{

	if (wcd->regmap)

		return wcd->regmap;



	return ERR_PTR(-EINVAL);

}

EXPORT_SYMBOL_GPL(wcd939x_swr_get_regmap);



static int wcd9390_update_status(struct sdw_slave *slave,

				 enum sdw_slave_status status)

{

sound/soc/codecs/wcd939x.c

+3 −3
Original line number Diff line number Diff line
@@ -3374,10 +3374,10 @@ static int wcd939x_bind(struct device *dev) 
	}



	/* Get regmap from TX SoundWire device */

	wcd939x->regmap = wcd939x_swr_get_regmap(wcd939x->sdw_priv[AIF1_CAP]);

	if (IS_ERR(wcd939x->regmap)) {

	wcd939x->regmap = wcd939x->sdw_priv[AIF1_CAP]->regmap;

	if (!wcd939x->regmap) {

		dev_err(dev, "could not get TX device regmap\n");

		ret = PTR_ERR(wcd939x->regmap);

		ret = -ENODEV;

		goto err_remove_rx_link;

	}

sound/soc/codecs/wcd939x.h

+0 −6
Original line number Diff line number Diff line
@@ -918,8 +918,6 @@ int wcd939x_sdw_hw_params(struct wcd939x_sdw_priv *wcd, 
			  struct snd_pcm_substream *substream,

			  struct snd_pcm_hw_params *params,

			  struct snd_soc_dai *dai);



struct regmap *wcd939x_swr_get_regmap(struct wcd939x_sdw_priv *wcd);

#else



static inline int wcd939x_sdw_free(struct wcd939x_sdw_priv *wcd,
@@ -944,10 +942,6 @@ static inline int wcd939x_sdw_hw_params(struct wcd939x_sdw_priv *wcd, 
	return -EOPNOTSUPP;

}



struct regmap *wcd939x_swr_get_regmap(struct wcd939x_sdw_priv *wcd)

{

	return PTR_ERR(-EINVAL);

}

#endif /* CONFIG_SND_SOC_WCD939X_SDW */



#endif /* __WCD939X_H__ */