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.
Signed-off-by: Takashi Iwai tiwai@suse.de --- include/sound/core.h | 4 ++-- sound/core/control.c | 2 +- sound/core/control_compat.c | 2 +- sound/core/init.c | 6 +----- sound/core/pcm_native.c | 4 ++-- sound/soc/soc-core.c | 2 +- sound/usb/usx2y/us122l.c | 2 +- 7 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/include/sound/core.h b/include/sound/core.h index 430d775b3c0e..e1192a337582 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -177,13 +177,13 @@ static inline void snd_power_unref(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); void snd_power_sync_ref(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/control.c b/sound/core/control.c index 37f6f2ca0543..c145c6011878 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -1774,7 +1774,7 @@ static long snd_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg card = ctl->card; if (snd_BUG_ON(!card)) return -ENXIO; - err = snd_power_wait(card, SNDRV_CTL_POWER_D0); + err = snd_power_wait(card); if (err < 0) return err; switch (cmd) { diff --git a/sound/core/control_compat.c b/sound/core/control_compat.c index b9fe1ead435b..b4554ae21e33 100644 --- a/sound/core/control_compat.c +++ b/sound/core/control_compat.c @@ -432,7 +432,7 @@ static inline long snd_ctl_ioctl_compat(struct file *file, unsigned int cmd, uns if (snd_BUG_ON(!ctl || !ctl->card)) return -ENXIO;
- err = snd_power_wait(ctl->card, SNDRV_CTL_POWER_D0); + err = snd_power_wait(ctl->card); if (err < 0) return err; switch (cmd) { diff --git a/sound/core/init.c b/sound/core/init.c index d11636fac608..7942da1085d2 100644 --- 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 3c6ba0dc2970..11acea02bc74 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -2801,7 +2801,7 @@ static int snd_pcm_release(struct inode *inode, struct file *file) pcm = substream->pcm;
/* block until the device gets woken up as it may touch the hardware */ - snd_power_wait(pcm->card, SNDRV_CTL_POWER_D0); + snd_power_wait(pcm->card);
mutex_lock(&pcm->open_mutex); snd_pcm_release_substream(substream); @@ -3197,7 +3197,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 1c0904acb935..ddc65c12f6f4 100644 --- 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 6e1bfe894dd5..596a1a1fea49 100644 --- 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;