ASoC: soc-component: add snd_soc_component_of_xlate_dai_id()

Current ALSA SoC is directly using component->driver->xxx,
thus, it is deep nested, and makes code difficult to read,
and is not good for encapsulation.
This patch adds new snd_soc_component_of_xlate_dai_id() and use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87zhl14d14.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
index b8480d947901f1621631b1d1bf954ce83e0a4c7a..3f4acd337c4ae931dcf1941ab531880773c2f32a 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -358,5 +358,7 @@ void snd_soc_component_resume(struct snd_soc_component *component);
 int snd_soc_component_is_suspended(struct snd_soc_component *component);
 int snd_soc_component_probe(struct snd_soc_component *component);
 void snd_soc_component_remove(struct snd_soc_component *component);
+int snd_soc_component_of_xlate_dai_id(struct snd_soc_component *component,
+                                     struct device_node *ep);
 
 #endif /* __SOC_COMPONENT_H */

diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index eba77ea2b62d04814510184221cf9d29dd9a0ef8..faf49992f661b6465bc9b01c271ce26213a506bd 100644 (file)
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -380,3 +380,12 @@ void snd_soc_component_remove(struct snd_soc_component *component)
        if (component->driver->remove)
                component->driver->remove(component);
 }
+
+int snd_soc_component_of_xlate_dai_id(struct snd_soc_component *component,
+                                     struct device_node *ep)
+{
+       if (component->driver->of_xlate_dai_id)
+               return component->driver->of_xlate_dai_id(component, ep);
+
+       return -ENOTSUPP;
+}

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 6a6403ddf62d660df22785741e49c37ad60efb74..f63d09dd55f41b8764a8974bb85997fc17a982e4 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3334,9 +3334,8 @@ int snd_soc_get_dai_id(struct device_node *ep)
        ret = -ENOTSUPP;
        mutex_lock(&client_mutex);
        component = soc_find_component(&dlc);
-       if (component &&
-           component->driver->of_xlate_dai_id)
-               ret = component->driver->of_xlate_dai_id(component, ep);
+       if (component)
+               ret = snd_soc_component_of_xlate_dai_id(component, ep);
        mutex_unlock(&client_mutex);
 
        of_node_put(dlc.of_node);