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

[linux-2.6-block.git] / sound / soc / intel / boards / sof_sdw_rt712_sdca.c

diff --git a/sound/soc/intel/boards/sof_sdw_rt712_sdca.c b/sound/soc/intel/boards/sof_sdw_rt712_sdca.c
index 42308228c634bb4dc30af0a1ddaacfe404b6d13d..ee2c57a50f0d4dd5b43f6add97dfe9fdc0b43bdf 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt712_sdca.c
+++ b/sound/soc/intel/boards/sof_sdw_rt712_sdca.c
@@ -15,10 +15,6 @@
 #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),
-};
-
 /*
  * dapm routes for rt712 spk will be registered dynamically according
  * to the number of rt712 spk used. The first two entries will be registered
@@ -30,10 +26,6 @@ static const struct snd_soc_dapm_route rt712_spk_map[] = {
        { "Speaker", NULL, "rt712 SPOR" },
 };
 
-static const struct snd_kcontrol_new generic_spk_controls[] = {
-       SOC_DAPM_PIN_SWITCH("Speaker"),
-};
-
 int rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_card *card = rtd->card;
@@ -45,20 +37,6 @@ int rt712_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, "rt712 spk controls addition failed: %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, "rt712 spk widgets addition failed: %d\n", ret);
-               return ret;
-       }
-
        ret = snd_soc_dapm_add_routes(&card->dapm, rt712_spk_map, ARRAY_SIZE(rt712_spk_map));
        if (ret)
                dev_err(rtd->dev, "failed to add SPK map: %d\n", ret);