Merge branch 'topic/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-dapm

4 files changed, 5 insertions, 33 deletions

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index badb6fbacaa6..01d112b48e7e 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -10,6 +10,7 @@ config SND_SOC_I2C_AND_SPI
 
 config SND_SOC_ALL_CODECS
         tristate "Build all ASoC CODEC drivers"
+        depends on COMPILE_TEST
         select SND_SOC_88PM860X if MFD_88PM860X
         select SND_SOC_L3
         select SND_SOC_AB8500_CODEC if ABX500_CORE
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 758761146a42..366daef006ed 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -174,36 +174,6 @@ static inline struct snd_soc_dapm_widget *dapm_cnew_widget(
         return kmemdup(_widget, sizeof(*_widget), GFP_KERNEL);
 }
 
-/* get snd_card from DAPM context */
-static inline struct snd_card *dapm_get_snd_card(
-        struct snd_soc_dapm_context *dapm)
-{
-        if (dapm->codec)
-                return dapm->codec->card->snd_card;
-        else if (dapm->platform)
-                return dapm->platform->card->snd_card;
-        else
-                BUG();
-
-        /* unreachable */
-        return NULL;
-}
-
-/* get soc_card from DAPM context */
-static inline struct snd_soc_card *dapm_get_soc_card(
-                struct snd_soc_dapm_context *dapm)
-{
-        if (dapm->codec)
-                return dapm->codec->card;
-        else if (dapm->platform)
-                return dapm->platform->card;
-        else
-                BUG();
-
-        /* unreachable */
-        return NULL;
-}
-
 static void dapm_reset(struct snd_soc_card *card)
 {
         struct snd_soc_dapm_widget *w;
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index 0bb5cccd7766..7aa26b5178aa 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -263,7 +263,7 @@ static irqreturn_t gpio_handler(int irq, void *data)
         if (device_may_wakeup(dev))
                 pm_wakeup_event(dev, gpio->debounce_time + 50);
 
-        schedule_delayed_work(&gpio->work,
+        queue_delayed_work(system_power_efficient_wq, &gpio->work,
                               msecs_to_jiffies(gpio->debounce_time));
 
         return IRQ_HANDLED;
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 5c2c66209808..fb70fbe26862 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -411,8 +411,9 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
                 } else {
                         /* start delayed pop wq here for playback streams */
                         rtd->pop_wait = 1;
-                        schedule_delayed_work(&rtd->delayed_work,
-                                msecs_to_jiffies(rtd->pmdown_time));
+                        queue_delayed_work(system_power_efficient_wq,
+                                           &rtd->delayed_work,
+                                           msecs_to_jiffies(rtd->pmdown_time));
                 }
         } else {
                 /* capture streams can be powered down now */