Skip to content

Commit

Permalink
ALSA: AACI: cleanup aaci_pcm_hw_params
Browse files Browse the repository at this point in the history
Since the recording and playback paths are now the same, eliminate
the needless conditionals.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Russell King authored and tiwai committed Dec 18, 2009
1 parent 6ca867c commit 4e30b69
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions sound/arm/aaci.c
Original file line number Diff line number Diff line change
Expand Up @@ -438,18 +438,14 @@ static int aaci_pcm_hw_params(struct snd_pcm_substream *substream,

err = snd_pcm_lib_malloc_pages(substream,
params_buffer_bytes(params));
if (err < 0)
goto out;

err = snd_ac97_pcm_open(aacirun->pcm, params_rate(params),
params_channels(params),
aacirun->pcm->r[0].slots);
if (err)
goto out;
if (err >= 0) {
err = snd_ac97_pcm_open(aacirun->pcm, params_rate(params),
params_channels(params),
aacirun->pcm->r[0].slots);

aacirun->pcm_open = 1;
aacirun->pcm_open = err == 0;
}

out:
return err;
}

Expand All @@ -458,7 +454,7 @@ static int aaci_pcm_prepare(struct snd_pcm_substream *substream)
struct snd_pcm_runtime *runtime = substream->runtime;
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->ptr = aacirun->start;
aacirun->period =
Expand Down

0 comments on commit 4e30b69

Please sign in to comment.