5 files changed, 13 insertions, 20 deletions

diff --git a/include/sound/core.h b/include/sound/core.h
index 7f32c12b4a0a..d1d043f6cb80 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -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 */
 
diff --git a/sound/core/control.c b/sound/core/control.c
index 574745314e70..22565c9b9603 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -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);
diff --git a/sound/core/control_compat.c b/sound/core/control_compat.c
index 84fef5084e17..3c0161bb5ba4 100644
--- a/sound/core/control_compat.c
+++ b/sound/core/control_compat.c
@@ -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);
diff --git a/sound/core/init.c b/sound/core/init.c
index 5bb8a8b23d51..39ed2e5bb0af 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);
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 01f150f0990e..7010eb271cc7 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -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;
         }