ALSA: Drop superfluous argument from snd_power_wait()

The power_state argument of snd_power_wait() is superfluous, receiving
only SNDRV_POWER_STATE_D0.  Let's drop it in all callers for
simplicity.

Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Acked-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20210523090920.15345-6-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/sound/core.h b/include/sound/core.h
index 3acb754108b17c7ee04cb6244020ed806a0f72f5..c4ade121727df984e8958a44ed0bcc5b5382f5ed 100644 (file)
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -189,12 +189,12 @@ static inline void snd_power_sync_ref(struct snd_card *card)
 }
 
 /* init.c */
-int snd_power_wait(struct snd_card *card, unsigned int power_state);
+int snd_power_wait(struct snd_card *card);
 int snd_power_ref_and_wait(struct snd_card *card);
 
 #else /* ! CONFIG_PM */
 
-static inline int snd_power_wait(struct snd_card *card, unsigned int state) { return 0; }
+static inline int snd_power_wait(struct snd_card *card) { return 0; }
 static inline void snd_power_ref(struct snd_card *card) {}
 static inline void snd_power_unref(struct snd_card *card) {}
 static inline int snd_power_ref_and_wait(struct snd_card *card) { return 0; }

diff --git a/sound/core/init.c b/sound/core/init.c
index 2c62e035bc6254d0e1702639345d8f2073c6bdf0..70114fd26956416cba039d57a4c388f5823466c6 100644 (file)
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -1050,19 +1050,15 @@ EXPORT_SYMBOL_GPL(snd_power_ref_and_wait);
 /**
  * snd_power_wait - wait until the card gets powered up (old form)
  * @card: soundcard structure
- * @power_state: expected power state
  *
  * Wait until the card gets powered up to SNDRV_CTL_POWER_D0 state.
- * @power_state must be SNDRV_CTL_POWER_D0.
  *
  * Return: Zero if successful, or a negative error code.
  */
-int snd_power_wait(struct snd_card *card, unsigned int power_state)
+int snd_power_wait(struct snd_card *card)
 {
        int ret;
 
-       if (WARN_ON(power_state != SNDRV_CTL_POWER_D0))
-               return 0;
        ret = snd_power_ref_and_wait(card);
        snd_power_unref(card);
        return ret;

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 8dbe86cf2e4f5b810d496ad0533595c95b71a492..82f80d0c068b948e72e167533b6a0a692d82db21 100644 (file)
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -3193,7 +3193,7 @@ static int snd_pcm_common_ioctl(struct file *file,
        if (PCM_RUNTIME_CHECK(substream))
                return -ENXIO;
 
-       res = snd_power_wait(substream->pcm->card, SNDRV_CTL_POWER_D0);
+       res = snd_power_wait(substream->pcm->card);
        if (res < 0)
                return res;
 

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 1c0904acb93564ded5d409b6d027aabc4d5d575f..ddc65c12f6f46053f03009ee24a7262bf694271a 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -580,7 +580,7 @@ int snd_soc_suspend(struct device *dev)
         * Due to the resume being scheduled into a workqueue we could
         * suspend before that's finished - wait for it to complete.
         */
-       snd_power_wait(card->snd_card, SNDRV_CTL_POWER_D0);
+       snd_power_wait(card->snd_card);
 
        /* we're going to block userspace touching us until resume completes */
        snd_power_change_state(card->snd_card, SNDRV_CTL_POWER_D3hot);

diff --git a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c
index 6e1bfe894dd5ddd57289f94355f352e1fdd1c827..596a1a1fea49f14ed46e303e4f9d47775fe78190 100644 (file)
--- a/sound/usb/usx2y/us122l.c
+++ b/sound/usb/usx2y/us122l.c
@@ -379,7 +379,7 @@ static int usb_stream_hwdep_ioctl(struct snd_hwdep *hw, struct file *file,
        if (cfg.period_frames < min_period_frames)
                return -EINVAL;
 
-       snd_power_wait(hw->card, SNDRV_CTL_POWER_D0);
+       snd_power_wait(hw->card);
 
        mutex_lock(&us122l->mutex);
        s = us122l->sk.s;