Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Srinivas Kandagatla 2025-09-09 13:19:46 +01:00 committed by Mark Brown
parent 2e07017b28
commit 772ed12bd0
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
9 changed files with 6 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/codecs/wcd937x-sdw.c
View File

@ -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, int wcd937x_sdw_hw_params(struct wcd937x_sdw_priv *wcd,
struct snd_pcm_substream *substream, struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params, struct snd_pcm_hw_params *params,

4
sound/soc/codecs/wcd937x.c
View File

@ -2788,7 +2788,7 @@ static int wcd937x_bind(struct device *dev)
return ret; return ret;
} }
wcd937x->rxdev = wcd937x_sdw_device_get(wcd937x->rxnode); wcd937x->rxdev = of_sdw_find_device_by_node(wcd937x->rxnode);
if (!wcd937x->rxdev) { if (!wcd937x->rxdev) {
dev_err(dev, "could not find slave with matching of node\n"); dev_err(dev, "could not find slave with matching of node\n");
return -EINVAL; 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] = dev_get_drvdata(wcd937x->rxdev);
wcd937x->sdw_priv[AIF1_PB]->wcd937x = wcd937x; 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) { if (!wcd937x->txdev) {
dev_err(dev, "could not find txslave with matching of node\n"); dev_err(dev, "could not find txslave with matching of node\n");
return -EINVAL; return -EINVAL;

2
sound/soc/codecs/wcd937x.h
View File

@ -549,8 +549,6 @@ int wcd937x_sdw_hw_params(struct wcd937x_sdw_priv *wcd,
struct snd_pcm_hw_params *params, struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai); struct snd_soc_dai *dai);
struct device *wcd937x_sdw_device_get(struct device_node *np);
#else #else
static inline int wcd937x_sdw_free(struct wcd937x_sdw_priv *wcd, static inline int wcd937x_sdw_free(struct wcd937x_sdw_priv *wcd,
struct snd_pcm_substream *substream, struct snd_pcm_substream *substream,

7
sound/soc/codecs/wcd938x-sdw.c
View File

@ -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 wcd938x_swr_get_current_bank(struct sdw_slave *sdev)
{ {
int bank; int bank;

4
sound/soc/codecs/wcd938x.c
View File

@ -3400,7 +3400,7 @@ static int wcd938x_bind(struct device *dev)
return ret; return ret;
} }
wcd938x->rxdev = wcd938x_sdw_device_get(wcd938x->rxnode); wcd938x->rxdev = of_sdw_find_device_by_node(wcd938x->rxnode);
if (!wcd938x->rxdev) { if (!wcd938x->rxdev) {
dev_err(dev, "could not find slave with matching of node\n"); dev_err(dev, "could not find slave with matching of node\n");
ret = -EINVAL; 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] = dev_get_drvdata(wcd938x->rxdev);
wcd938x->sdw_priv[AIF1_PB]->wcd938x = wcd938x; 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) { if (!wcd938x->txdev) {
dev_err(dev, "could not find txslave with matching of node\n"); dev_err(dev, "could not find txslave with matching of node\n");
ret = -EINVAL; ret = -EINVAL;

6
sound/soc/codecs/wcd938x.h
View File

@ -670,7 +670,6 @@ int wcd938x_sdw_hw_params(struct wcd938x_sdw_priv *wcd,
struct snd_pcm_hw_params *params, struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai); 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); int wcd938x_swr_get_current_bank(struct sdw_slave *sdev);
#else #else
@ -697,11 +696,6 @@ static inline int wcd938x_sdw_hw_params(struct wcd938x_sdw_priv *wcd,
return -EOPNOTSUPP; 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) static inline int wcd938x_swr_get_current_bank(struct sdw_slave *sdev)
{ {
return 0; return 0;

6
sound/soc/codecs/wcd939x-sdw.c
View File

@ -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) unsigned int wcd939x_swr_get_current_bank(struct sdw_slave *sdev)
{ {
return FIELD_GET(SDW_SCP_STAT_CURR_BANK, return FIELD_GET(SDW_SCP_STAT_CURR_BANK,

4
sound/soc/codecs/wcd939x.c
View File

@ -3383,7 +3383,7 @@ static int wcd939x_bind(struct device *dev)
goto err_put_typec_switch; 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) { if (!wcd939x->rxdev) {
dev_err(dev, "could not find slave with matching of node\n"); dev_err(dev, "could not find slave with matching of node\n");
ret = -EINVAL; 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] = dev_get_drvdata(wcd939x->rxdev);
wcd939x->sdw_priv[AIF1_PB]->wcd939x = wcd939x; 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) { if (!wcd939x->txdev) {
dev_err(dev, "could not find txslave with matching of node\n"); dev_err(dev, "could not find txslave with matching of node\n");
ret = -EINVAL; ret = -EINVAL;

6
sound/soc/codecs/wcd939x.h
View File

@ -930,7 +930,6 @@ int wcd939x_sdw_hw_params(struct wcd939x_sdw_priv *wcd,
struct snd_pcm_hw_params *params, struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai); 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); unsigned int wcd939x_swr_get_current_bank(struct sdw_slave *sdev);
struct regmap *wcd939x_swr_get_regmap(struct wcd939x_sdw_priv *wcd); 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; 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) static inline unsigned int wcd939x_swr_get_current_bank(struct sdw_slave *sdev)
{ {
return 0; return 0;