Commit b6cc78da authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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: default avatarJaroslav Kysela <perex@perex.cz>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20210523090920.15345-6-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 968bb2ba

include/sound/core.h

+2 −2
Original line number Diff line number Diff line
@@ -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; }

sound/core/init.c

+1 −5
Original line number Diff line number Diff line
@@ -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;

sound/core/pcm_native.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

sound/soc/soc-core.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

sound/usb/usx2y/us122l.c

+1 −1
Original line number Diff line number Diff line
@@ -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;