ASoC: Intel: sof_sdw: use .controls/.widgets to add controls/widgets

[sfrench/cifs-2.6.git] / sound / soc / intel / boards / sof_sdw_rt722_sdca.c

diff --git a/sound/soc/intel/boards/sof_sdw_rt722_sdca.c b/sound/soc/intel/boards/sof_sdw_rt722_sdca.c
index 1653e45a0f7d60ef9e3cd12f48678ded37e7a19b..02ee8e33a99ae6a5efc6750a6ca5ee6026f2604c 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt722_sdca.c
+++ b/sound/soc/intel/boards/sof_sdw_rt722_sdca.c
@@ -15,18 +15,10 @@
 #include <sound/soc-dapm.h>
 #include "sof_sdw_common.h"
 
-static const struct snd_soc_dapm_widget generic_spk_widgets[] = {
-       SND_SOC_DAPM_SPK("Speaker", NULL),
-};
-
 static const struct snd_soc_dapm_route rt722_spk_map[] = {
        { "Speaker", NULL, "rt722 SPK" },
 };
 
-static const struct snd_kcontrol_new generic_spk_controls[] = {
-       SOC_DAPM_PIN_SWITCH("Speaker"),
-};
-
 int rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_card *card = rtd->card;
@@ -38,20 +30,6 @@ int rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
        if (!card->components)
                return -ENOMEM;
 
-       ret = snd_soc_add_card_controls(card, generic_spk_controls,
-                                       ARRAY_SIZE(generic_spk_controls));
-       if (ret) {
-               dev_err(card->dev, "failed to add rt722 spk controls: %d\n", ret);
-               return ret;
-       }
-
-       ret = snd_soc_dapm_new_controls(&card->dapm, generic_spk_widgets,
-                                       ARRAY_SIZE(generic_spk_widgets));
-       if (ret) {
-               dev_err(card->dev, "failed to add rt722 spk widgets: %d\n", ret);
-               return ret;
-       }
-
        ret = snd_soc_dapm_add_routes(&card->dapm, rt722_spk_map, ARRAY_SIZE(rt722_spk_map));
        if (ret)
                dev_err(rtd->dev, "failed to add rt722 spk map: %d\n", ret);