diff options
| author | Takashi Iwai <tiwai@suse.de> | 2006-03-27 12:38:07 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-03-31 17:58:56 +0200 |
| commit | cbac4b0cb62d01cb0aaec7778410b8856f01186b (patch) | |
| tree | fee9fbb6522e4eda29bb5d3590c0e844734af2bc /sound/core/init.c | |
| parent | 6285ae1df13d55454d3de48504cb97e0cde4ecfa (diff) | |
| download | kernel_samsung_tuna-cbac4b0cb62d01cb0aaec7778410b8856f01186b.zip kernel_samsung_tuna-cbac4b0cb62d01cb0aaec7778410b8856f01186b.tar.gz kernel_samsung_tuna-cbac4b0cb62d01cb0aaec7778410b8856f01186b.tar.bz2 | |
[ALSA] Cleanup unused argument for snd_power_wait()
Removed the unused file argument of snd_power_wait().
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/init.c')
| -rw-r--r-- | sound/core/init.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sound/core/init.c b/sound/core/init.c index 5bb8a8b..39ed2e5 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -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); |