ASoC: meson: aiu: simplify component addition

Now that the component name is unique within ASoC, there is no need to
hack the debugfs prefix to add more than one ASoC component to a linux
device. Remove the unnecessary function and use
snd_soc_register_component() directly.

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/20200217092019.433402-1-jbrunet@baylibre.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/meson/aiu-acodec-ctrl.c b/sound/soc/meson/aiu-acodec-ctrl.c
index b8e88b1a4fc87e77469fe6a3f4d073610f960dd9..7078197e0cc5027633b6c3957eabd5c6c0eea799 100644 (file)
--- a/sound/soc/meson/aiu-acodec-ctrl.c
+++ b/sound/soc/meson/aiu-acodec-ctrl.c
@@ -197,8 +197,7 @@ static const struct snd_soc_component_driver aiu_acodec_ctrl_component = {
 
 int aiu_acodec_ctrl_register_component(struct device *dev)
 {
-       return aiu_add_component(dev, &aiu_acodec_ctrl_component,
-                                aiu_acodec_ctrl_dai_drv,
-                                ARRAY_SIZE(aiu_acodec_ctrl_dai_drv),
-                                "acodec");
+       return snd_soc_register_component(dev, &aiu_acodec_ctrl_component,
+                                         aiu_acodec_ctrl_dai_drv,
+                                         ARRAY_SIZE(aiu_acodec_ctrl_dai_drv));
 }

diff --git a/sound/soc/meson/aiu-codec-ctrl.c b/sound/soc/meson/aiu-codec-ctrl.c
index 8646a953e3b33f88d06cfc41404dbbb124bb0ed4..4b773d3e8b073558aeef00d9f69d777785af025f 100644 (file)
--- a/sound/soc/meson/aiu-codec-ctrl.c
+++ b/sound/soc/meson/aiu-codec-ctrl.c
@@ -144,9 +144,8 @@ static const struct snd_soc_component_driver aiu_hdmi_ctrl_component = {
 
 int aiu_hdmi_ctrl_register_component(struct device *dev)
 {
-       return aiu_add_component(dev, &aiu_hdmi_ctrl_component,
-                                aiu_hdmi_ctrl_dai_drv,
-                                ARRAY_SIZE(aiu_hdmi_ctrl_dai_drv),
-                                "hdmi");
+       return snd_soc_register_component(dev, &aiu_hdmi_ctrl_component,
+                                         aiu_hdmi_ctrl_dai_drv,
+                                         ARRAY_SIZE(aiu_hdmi_ctrl_dai_drv));
 }
 

diff --git a/sound/soc/meson/aiu.c b/sound/soc/meson/aiu.c
index 34b40b8b82997ffc360f2c1e3bc1fedd55c2f047..d3e2d40e9562581f02693d64935d93514ea0f3c8 100644 (file)
--- a/sound/soc/meson/aiu.c
+++ b/sound/soc/meson/aiu.c
@@ -71,26 +71,6 @@ int aiu_of_xlate_dai_name(struct snd_soc_component *component,
        return 0;
 }
 
-int aiu_add_component(struct device *dev,
-                     const struct snd_soc_component_driver *component_driver,
-                     struct snd_soc_dai_driver *dai_drv,
-                     int num_dai,
-                     const char *debugfs_prefix)
-{
-       struct snd_soc_component *component;
-
-       component = devm_kzalloc(dev, sizeof(*component), GFP_KERNEL);
-       if (!component)
-               return -ENOMEM;
-
-#ifdef CONFIG_DEBUG_FS
-       component->debugfs_prefix = debugfs_prefix;
-#endif
-
-       return snd_soc_add_component(dev, component, component_driver,
-                                    dai_drv, num_dai);
-}
-
 static int aiu_cpu_of_xlate_dai_name(struct snd_soc_component *component,
                                     struct of_phandle_args *args,
                                     const char **dai_name)

diff --git a/sound/soc/meson/aiu.h b/sound/soc/meson/aiu.h
index 097c26de7b7c60d694efff7372654da838bd0a7a..06a968c557287b37ae9b25a9f08e5db53ca03096 100644 (file)
--- a/sound/soc/meson/aiu.h
+++ b/sound/soc/meson/aiu.h
@@ -11,9 +11,7 @@ struct clk;
 struct clk_bulk_data;
 struct device;
 struct of_phandle_args;
-struct snd_soc_component_driver;
 struct snd_soc_dai;
-struct snd_soc_dai_driver;
 struct snd_soc_dai_ops;
 
 enum aiu_clk_ids {
@@ -45,12 +43,6 @@ int aiu_of_xlate_dai_name(struct snd_soc_component *component,
                          const char **dai_name,
                          unsigned int component_id);
 
-int aiu_add_component(struct device *dev,
-                     const struct snd_soc_component_driver *component_driver,
-                     struct snd_soc_dai_driver *dai_drv,
-                     int num_dai,
-                     const char *debugfs_prefix);
-
 int aiu_hdmi_ctrl_register_component(struct device *dev);
 int aiu_acodec_ctrl_register_component(struct device *dev);