Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbac4b0c authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] Cleanup unused argument for snd_power_wait() 



Removed the unused file argument of snd_power_wait().

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

include/sound/core.h

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static inline void snd_power_change_state(struct snd_card *card, unsigned int st 
}



/* init.c */

int snd_power_wait(struct snd_card *card, unsigned int power_state, struct file *file);

int snd_power_wait(struct snd_card *card, unsigned int power_state);



#else /* ! CONFIG_PM */

sound/core/control.c

+3 −3
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ static int snd_ctl_elem_info_user(struct snd_ctl_file *ctl, 
	if (copy_from_user(&info, _info, sizeof(info)))

		return -EFAULT;

	snd_power_lock(ctl->card);

	result = snd_power_wait(ctl->card, SNDRV_CTL_POWER_D0, NULL);

	result = snd_power_wait(ctl->card, SNDRV_CTL_POWER_D0);

	if (result >= 0)

		result = snd_ctl_elem_info(ctl, &info);

	snd_power_unlock(ctl->card);
@@ -718,7 +718,7 @@ static int snd_ctl_elem_read_user(struct snd_card *card, 
		return -EFAULT;

	}

	snd_power_lock(card);

	result = snd_power_wait(card, SNDRV_CTL_POWER_D0, NULL);

	result = snd_power_wait(card, SNDRV_CTL_POWER_D0);

	if (result >= 0)

		result = snd_ctl_elem_read(card, control);

	snd_power_unlock(card);
@@ -783,7 +783,7 @@ static int snd_ctl_elem_write_user(struct snd_ctl_file *file, 
	}

	card = file->card;

	snd_power_lock(card);

	result = snd_power_wait(card, SNDRV_CTL_POWER_D0, NULL);

	result = snd_power_wait(card, SNDRV_CTL_POWER_D0);

	if (result >= 0)

		result = snd_ctl_elem_write(card, file, control);

	snd_power_unlock(card);

sound/core/control_compat.c

+3 −3
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static int snd_ctl_elem_info_compat(struct snd_ctl_file *ctl, 
		goto error;



	snd_power_lock(ctl->card);

	err = snd_power_wait(ctl->card, SNDRV_CTL_POWER_D0, NULL);

	err = snd_power_wait(ctl->card, SNDRV_CTL_POWER_D0);

	if (err >= 0)

		err = snd_ctl_elem_info(ctl, data);

	snd_power_unlock(ctl->card);
@@ -294,7 +294,7 @@ static int snd_ctl_elem_read_user_compat(struct snd_card *card, 
		goto error;



	snd_power_lock(card);

	err = snd_power_wait(card, SNDRV_CTL_POWER_D0, NULL);

	err = snd_power_wait(card, SNDRV_CTL_POWER_D0);

	if (err >= 0)

		err = snd_ctl_elem_read(card, data);

	snd_power_unlock(card);
@@ -320,7 +320,7 @@ static int snd_ctl_elem_write_user_compat(struct snd_ctl_file *file, 
		goto error;



	snd_power_lock(card);

	err = snd_power_wait(card, SNDRV_CTL_POWER_D0, NULL);

	err = snd_power_wait(card, SNDRV_CTL_POWER_D0);

	if (err >= 0)

		err = snd_ctl_elem_write(card, file, data);

	snd_power_unlock(card);

sound/core/init.c

+1 −8
Original line number Diff line number Diff line
@@ -722,13 +722,12 @@ int snd_card_file_remove(struct snd_card *card, struct file *file) 
 *  snd_power_wait - wait until the power-state is changed.

 *  @card: soundcard structure

 *  @power_state: expected power state

 *  @file: file structure for the O_NONBLOCK check (optional)

 *

 *  Waits until the power-state is changed.

 *

 *  Note: the power lock must be active before call.

 */

int snd_power_wait(struct snd_card *card, unsigned int power_state, struct file *file)

int snd_power_wait(struct snd_card *card, unsigned int power_state)

{

	wait_queue_t wait;

	int result = 0;
@@ -745,12 +744,6 @@ int snd_power_wait(struct snd_card *card, unsigned int power_state, struct file 
		}

		if (snd_power_get_state(card) == power_state)

			break;

#if 0 /* block all devices */

		if (file && (file->f_flags & O_NONBLOCK)) {

			result = -EAGAIN;

			break;

		}

#endif

		set_current_state(TASK_UNINTERRUPTIBLE);

		snd_power_unlock(card);

		schedule_timeout(30 * HZ);

sound/core/pcm_native.c

+5 −5
Original line number Diff line number Diff line
@@ -1170,7 +1170,7 @@ static int snd_pcm_resume(struct snd_pcm_substream *substream) 
	int res;



	snd_power_lock(card);

	if ((res = snd_power_wait(card, SNDRV_CTL_POWER_D0, substream->ffile)) >= 0)

	if ((res = snd_power_wait(card, SNDRV_CTL_POWER_D0)) >= 0)

		res = snd_pcm_action_lock_irq(&snd_pcm_action_resume, substream, 0);

	snd_power_unlock(card);

	return res;
@@ -1198,7 +1198,7 @@ static int snd_pcm_xrun(struct snd_pcm_substream *substream) 


	snd_power_lock(card);

	if (runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) {

		result = snd_power_wait(card, SNDRV_CTL_POWER_D0, substream->ffile);

		result = snd_power_wait(card, SNDRV_CTL_POWER_D0);

		if (result < 0)

			goto _unlock;

	}
@@ -1319,7 +1319,7 @@ int snd_pcm_prepare(struct snd_pcm_substream *substream) 
	struct snd_card *card = substream->pcm->card;



	snd_power_lock(card);

	if ((res = snd_power_wait(card, SNDRV_CTL_POWER_D0, substream->ffile)) >= 0)

	if ((res = snd_power_wait(card, SNDRV_CTL_POWER_D0)) >= 0)

		res = snd_pcm_action_nonatomic(&snd_pcm_action_prepare, substream, 0);

	snd_power_unlock(card);

	return res;
@@ -1410,7 +1410,7 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream) 


	snd_power_lock(card);

	if (runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) {

		result = snd_power_wait(card, SNDRV_CTL_POWER_D0, substream->ffile);

		result = snd_power_wait(card, SNDRV_CTL_POWER_D0);

		if (result < 0) {

			snd_power_unlock(card);

			return result;
@@ -1533,7 +1533,7 @@ static int snd_pcm_drop(struct snd_pcm_substream *substream) 


	snd_power_lock(card);

	if (runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) {

		result = snd_power_wait(card, SNDRV_CTL_POWER_D0, substream->ffile);

		result = snd_power_wait(card, SNDRV_CTL_POWER_D0);

		if (result < 0)

			goto _unlock;

	}