diff options
author | Takashi Iwai <tiwai@suse.de> | 2006-03-27 05:38:07 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-03-31 10:58:56 -0500 |
commit | cbac4b0cb62d01cb0aaec7778410b8856f01186b (patch) | |
tree | fee9fbb6522e4eda29bb5d3590c0e844734af2bc /sound/core/pcm_native.c | |
parent | 6285ae1df13d55454d3de48504cb97e0cde4ecfa (diff) |
[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/pcm_native.c')
-rw-r--r-- | sound/core/pcm_native.c | 10 |
1 files changed, 5 insertions, 5 deletions
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) | |||
1170 | int res; | 1170 | int res; |
1171 | 1171 | ||
1172 | snd_power_lock(card); | 1172 | snd_power_lock(card); |
1173 | if ((res = snd_power_wait(card, SNDRV_CTL_POWER_D0, substream->ffile)) >= 0) | 1173 | if ((res = snd_power_wait(card, SNDRV_CTL_POWER_D0)) >= 0) |
1174 | res = snd_pcm_action_lock_irq(&snd_pcm_action_resume, substream, 0); | 1174 | res = snd_pcm_action_lock_irq(&snd_pcm_action_resume, substream, 0); |
1175 | snd_power_unlock(card); | 1175 | snd_power_unlock(card); |
1176 | return res; | 1176 | return res; |
@@ -1198,7 +1198,7 @@ static int snd_pcm_xrun(struct snd_pcm_substream *substream) | |||
1198 | 1198 | ||
1199 | snd_power_lock(card); | 1199 | snd_power_lock(card); |
1200 | if (runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) { | 1200 | if (runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) { |
1201 | result = snd_power_wait(card, SNDRV_CTL_POWER_D0, substream->ffile); | 1201 | result = snd_power_wait(card, SNDRV_CTL_POWER_D0); |
1202 | if (result < 0) | 1202 | if (result < 0) |
1203 | goto _unlock; | 1203 | goto _unlock; |
1204 | } | 1204 | } |
@@ -1319,7 +1319,7 @@ int snd_pcm_prepare(struct snd_pcm_substream *substream) | |||
1319 | struct snd_card *card = substream->pcm->card; | 1319 | struct snd_card *card = substream->pcm->card; |
1320 | 1320 | ||
1321 | snd_power_lock(card); | 1321 | snd_power_lock(card); |
1322 | if ((res = snd_power_wait(card, SNDRV_CTL_POWER_D0, substream->ffile)) >= 0) | 1322 | if ((res = snd_power_wait(card, SNDRV_CTL_POWER_D0)) >= 0) |
1323 | res = snd_pcm_action_nonatomic(&snd_pcm_action_prepare, substream, 0); | 1323 | res = snd_pcm_action_nonatomic(&snd_pcm_action_prepare, substream, 0); |
1324 | snd_power_unlock(card); | 1324 | snd_power_unlock(card); |
1325 | return res; | 1325 | return res; |
@@ -1410,7 +1410,7 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream) | |||
1410 | 1410 | ||
1411 | snd_power_lock(card); | 1411 | snd_power_lock(card); |
1412 | if (runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) { | 1412 | if (runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) { |
1413 | result = snd_power_wait(card, SNDRV_CTL_POWER_D0, substream->ffile); | 1413 | result = snd_power_wait(card, SNDRV_CTL_POWER_D0); |
1414 | if (result < 0) { | 1414 | if (result < 0) { |
1415 | snd_power_unlock(card); | 1415 | snd_power_unlock(card); |
1416 | return result; | 1416 | return result; |
@@ -1533,7 +1533,7 @@ static int snd_pcm_drop(struct snd_pcm_substream *substream) | |||
1533 | 1533 | ||
1534 | snd_power_lock(card); | 1534 | snd_power_lock(card); |
1535 | if (runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) { | 1535 | if (runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) { |
1536 | result = snd_power_wait(card, SNDRV_CTL_POWER_D0, substream->ffile); | 1536 | result = snd_power_wait(card, SNDRV_CTL_POWER_D0); |
1537 | if (result < 0) | 1537 | if (result < 0) |
1538 | goto _unlock; | 1538 | goto _unlock; |
1539 | } | 1539 | } |