Commit 4e30b691 authored by Russell King's avatar Russell King Committed by Takashi Iwai

ALSA: AACI: cleanup aaci_pcm_hw_params

Since the recording and playback paths are now the same, eliminate
the needless conditionals.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6ca867c8
...@@ -438,18 +438,14 @@ static int aaci_pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -438,18 +438,14 @@ static int aaci_pcm_hw_params(struct snd_pcm_substream *substream,
err = snd_pcm_lib_malloc_pages(substream, err = snd_pcm_lib_malloc_pages(substream,
params_buffer_bytes(params)); params_buffer_bytes(params));
if (err < 0) if (err >= 0) {
goto out;
err = snd_ac97_pcm_open(aacirun->pcm, params_rate(params), err = snd_ac97_pcm_open(aacirun->pcm, params_rate(params),
params_channels(params), params_channels(params),
aacirun->pcm->r[0].slots); aacirun->pcm->r[0].slots);
if (err)
goto out;
aacirun->pcm_open = 1; aacirun->pcm_open = err == 0;
}
out:
return err; return err;
} }
...@@ -458,7 +454,7 @@ static int aaci_pcm_prepare(struct snd_pcm_substream *substream) ...@@ -458,7 +454,7 @@ static int aaci_pcm_prepare(struct snd_pcm_substream *substream)
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct aaci_runtime *aacirun = runtime->private_data; struct aaci_runtime *aacirun = runtime->private_data;
aacirun->start = (void *)runtime->dma_area; aacirun->start = runtime->dma_area;
aacirun->end = aacirun->start + snd_pcm_lib_buffer_bytes(substream); aacirun->end = aacirun->start + snd_pcm_lib_buffer_bytes(substream);
aacirun->ptr = aacirun->start; aacirun->ptr = aacirun->start;
aacirun->period = aacirun->period =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment