ASoC: codecs: wcdxxxx: use of_sdw_find_device_by_node helper

use of_sdw_find_device_by_node helper function, rather than duplicating
this function in every codec driver.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://patch.msgid.link/20250909121954.225833-6-srinivas.kandagatla@oss.qualcomm.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wcd937x-sdw.c b/sound/soc/codecs/wcd937x-sdw.c
index 1bfe7383b31117ebc16a2d5b666350b9e399d3d3..e7cc699bd8bcf1260ebcce705436decf786820bb 100644 (file)
--- a/sound/soc/codecs/wcd937x-sdw.c
+++ b/sound/soc/codecs/wcd937x-sdw.c
@@ -78,12 +78,6 @@ static struct sdw_dpn_prop wcd937x_dpn_prop[WCD937X_MAX_SWR_PORTS] = {
        }
 };
 
-struct device *wcd937x_sdw_device_get(struct device_node *np)
-{
-       return bus_find_device_by_of_node(&sdw_bus_type, np);
-}
-EXPORT_SYMBOL_GPL(wcd937x_sdw_device_get);
-
 int wcd937x_sdw_hw_params(struct wcd937x_sdw_priv *wcd,
                          struct snd_pcm_substream *substream,
                          struct snd_pcm_hw_params *params,

diff --git a/sound/soc/codecs/wcd937x.c b/sound/soc/codecs/wcd937x.c
index de2dff3c56d3283c6d8385ed5b48c6bd4a0c340e..b78f37c582cadee0474703f475e257d5f4ce05c3 100644 (file)
--- a/sound/soc/codecs/wcd937x.c
+++ b/sound/soc/codecs/wcd937x.c
@@ -2788,7 +2788,7 @@ static int wcd937x_bind(struct device *dev)
                return ret;
        }
 
-       wcd937x->rxdev = wcd937x_sdw_device_get(wcd937x->rxnode);
+       wcd937x->rxdev = of_sdw_find_device_by_node(wcd937x->rxnode);
        if (!wcd937x->rxdev) {
                dev_err(dev, "could not find slave with matching of node\n");
                return -EINVAL;
@@ -2797,7 +2797,7 @@ static int wcd937x_bind(struct device *dev)
        wcd937x->sdw_priv[AIF1_PB] = dev_get_drvdata(wcd937x->rxdev);
        wcd937x->sdw_priv[AIF1_PB]->wcd937x = wcd937x;
 
-       wcd937x->txdev = wcd937x_sdw_device_get(wcd937x->txnode);
+       wcd937x->txdev = of_sdw_find_device_by_node(wcd937x->txnode);
        if (!wcd937x->txdev) {
                dev_err(dev, "could not find txslave with matching of node\n");
                return -EINVAL;

diff --git a/sound/soc/codecs/wcd937x.h b/sound/soc/codecs/wcd937x.h
index d20886a2803a4cd892079bca4c65af89d293643d..0f96b7108a7ebe7a7adfb78a91650058b8d4a1d4 100644 (file)
--- a/sound/soc/codecs/wcd937x.h
+++ b/sound/soc/codecs/wcd937x.h
@@ -549,8 +549,6 @@ int wcd937x_sdw_hw_params(struct wcd937x_sdw_priv *wcd,
                          struct snd_pcm_hw_params *params,
                          struct snd_soc_dai *dai);
 
-struct device *wcd937x_sdw_device_get(struct device_node *np);
-
 #else
 static inline int wcd937x_sdw_free(struct wcd937x_sdw_priv *wcd,
                     struct snd_pcm_substream *substream,

diff --git a/sound/soc/codecs/wcd938x-sdw.c b/sound/soc/codecs/wcd938x-sdw.c
index e822cc14525066a8fff1e1d2de5cc7fdb38d77d1..a7514d716086ca533e369f37053ffbdf5b01a63f 100644 (file)
--- a/sound/soc/codecs/wcd938x-sdw.c
+++ b/sound/soc/codecs/wcd938x-sdw.c
@@ -82,13 +82,6 @@ static struct sdw_dpn_prop wcd938x_dpn_prop[WCD938X_MAX_SWR_PORTS] = {
        }
 };
 
-struct device *wcd938x_sdw_device_get(struct device_node *np)
-{
-       return bus_find_device_by_of_node(&sdw_bus_type, np);
-
-}
-EXPORT_SYMBOL_GPL(wcd938x_sdw_device_get);
-
 int wcd938x_swr_get_current_bank(struct sdw_slave *sdev)
 {
        int bank;

diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c
index 711f373ece24cf4e0db73e9e9b8432b3ce3a1717..e2cb0758bca7909c55ed1cf616761c817d37a70c 100644 (file)
--- a/sound/soc/codecs/wcd938x.c
+++ b/sound/soc/codecs/wcd938x.c
@@ -3400,7 +3400,7 @@ static int wcd938x_bind(struct device *dev)
                return ret;
        }
 
-       wcd938x->rxdev = wcd938x_sdw_device_get(wcd938x->rxnode);
+       wcd938x->rxdev = of_sdw_find_device_by_node(wcd938x->rxnode);
        if (!wcd938x->rxdev) {
                dev_err(dev, "could not find slave with matching of node\n");
                ret = -EINVAL;
@@ -3409,7 +3409,7 @@ static int wcd938x_bind(struct device *dev)
        wcd938x->sdw_priv[AIF1_PB] = dev_get_drvdata(wcd938x->rxdev);
        wcd938x->sdw_priv[AIF1_PB]->wcd938x = wcd938x;
 
-       wcd938x->txdev = wcd938x_sdw_device_get(wcd938x->txnode);
+       wcd938x->txdev = of_sdw_find_device_by_node(wcd938x->txnode);
        if (!wcd938x->txdev) {
                dev_err(dev, "could not find txslave with matching of node\n");
                ret = -EINVAL;

diff --git a/sound/soc/codecs/wcd938x.h b/sound/soc/codecs/wcd938x.h
index fb6a0e4ef33774fcff7958d1bec281ea985cdde9..dbafcae247f4fb8be95492031a78fa794770e01a 100644 (file)
--- a/sound/soc/codecs/wcd938x.h
+++ b/sound/soc/codecs/wcd938x.h
@@ -670,7 +670,6 @@ int wcd938x_sdw_hw_params(struct wcd938x_sdw_priv *wcd,
                          struct snd_pcm_hw_params *params,
                          struct snd_soc_dai *dai);
 
-struct device *wcd938x_sdw_device_get(struct device_node *np);
 int wcd938x_swr_get_current_bank(struct sdw_slave *sdev);
 
 #else
@@ -697,11 +696,6 @@ static inline int wcd938x_sdw_hw_params(struct wcd938x_sdw_priv *wcd,
        return -EOPNOTSUPP;
 }
 
-static inline struct device *wcd938x_sdw_device_get(struct device_node *np)
-{
-       return NULL;
-}
-
 static inline int wcd938x_swr_get_current_bank(struct sdw_slave *sdev)
 {
        return 0;

diff --git a/sound/soc/codecs/wcd939x-sdw.c b/sound/soc/codecs/wcd939x-sdw.c
index f7a9323a9feadb3ab8210bd15d9048c19d7059f8..e487a1bb0194e1917d8a45fda2d69248d5e83e07 100644 (file)
--- a/sound/soc/codecs/wcd939x-sdw.c
+++ b/sound/soc/codecs/wcd939x-sdw.c
@@ -128,12 +128,6 @@ static struct sdw_dpn_prop wcd939x_tx_dpn_prop[WCD939X_MAX_TX_SWR_PORTS] = {
        }
 };
 
-struct device *wcd939x_sdw_device_get(struct device_node *np)
-{
-       return bus_find_device_by_of_node(&sdw_bus_type, np);
-}
-EXPORT_SYMBOL_GPL(wcd939x_sdw_device_get);
-
 unsigned int wcd939x_swr_get_current_bank(struct sdw_slave *sdev)
 {
        return FIELD_GET(SDW_SCP_STAT_CURR_BANK,

diff --git a/sound/soc/codecs/wcd939x.c b/sound/soc/codecs/wcd939x.c
index 64f082e474c1d404699e304743ed1ada3481effb..5a56c79a89227791c364ab7c1242c5fb2116f22c 100644 (file)
--- a/sound/soc/codecs/wcd939x.c
+++ b/sound/soc/codecs/wcd939x.c
@@ -3383,7 +3383,7 @@ static int wcd939x_bind(struct device *dev)
                goto err_put_typec_switch;
        }
 
-       wcd939x->rxdev = wcd939x_sdw_device_get(wcd939x->rxnode);
+       wcd939x->rxdev = of_sdw_find_device_by_node(wcd939x->rxnode);
        if (!wcd939x->rxdev) {
                dev_err(dev, "could not find slave with matching of node\n");
                ret = -EINVAL;
@@ -3392,7 +3392,7 @@ static int wcd939x_bind(struct device *dev)
        wcd939x->sdw_priv[AIF1_PB] = dev_get_drvdata(wcd939x->rxdev);
        wcd939x->sdw_priv[AIF1_PB]->wcd939x = wcd939x;
 
-       wcd939x->txdev = wcd939x_sdw_device_get(wcd939x->txnode);
+       wcd939x->txdev = of_sdw_find_device_by_node(wcd939x->txnode);
        if (!wcd939x->txdev) {
                dev_err(dev, "could not find txslave with matching of node\n");
                ret = -EINVAL;

diff --git a/sound/soc/codecs/wcd939x.h b/sound/soc/codecs/wcd939x.h
index 3204fb10b58d7d72000e94715f68ce17cf841060..3f189e5cafd51719021fd77bbcd9aa4e1c61a351 100644 (file)
--- a/sound/soc/codecs/wcd939x.h
+++ b/sound/soc/codecs/wcd939x.h
@@ -930,7 +930,6 @@ int wcd939x_sdw_hw_params(struct wcd939x_sdw_priv *wcd,
                          struct snd_pcm_hw_params *params,
                          struct snd_soc_dai *dai);
 
-struct device *wcd939x_sdw_device_get(struct device_node *np);
 unsigned int wcd939x_swr_get_current_bank(struct sdw_slave *sdev);
 
 struct regmap *wcd939x_swr_get_regmap(struct wcd939x_sdw_priv *wcd);
@@ -958,11 +957,6 @@ static inline int wcd939x_sdw_hw_params(struct wcd939x_sdw_priv *wcd,
        return -EOPNOTSUPP;
 }
 
-static inline struct device *wcd939x_sdw_device_get(struct device_node *np)
-{
-       return NULL;
-}
-
 static inline unsigned int wcd939x_swr_get_current_bank(struct sdw_slave *sdev)
 {
        return 0;