AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-23 04:17:58 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: bcm2835-audio: Use PCM runtime values instead

Browse Source 
Some fields in alsa_stream are the values we keep already in PCM
runtime object, hence they are redundant.  Use the standard PCM
runtime values instead of the private copies.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Takashi Iwai 2018-09-04 17:58:40 +02:00 committed by Greg Kroah-Hartman
parent 50e4acab33
commit 5d0be6da7f
2 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
View File

@ -206,22 +206,7 @@ static int snd_bcm2835_playback_close(struct snd_pcm_substream *substream)
static int snd_bcm2835_pcm_hw_params(struct snd_pcm_substream *substream, static int snd_bcm2835_pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
struct snd_pcm_runtime *runtime = substream->runtime; return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
struct bcm2835_alsa_stream *alsa_stream = runtime->private_data;
int err;
err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
if (err < 0) {
audio_error
(" pcm_lib_malloc failed to allocated pages for buffers\n");
return err;
}
alsa_stream->channels = params_channels(params);
alsa_stream->params_rate = params_rate(params);
alsa_stream->pcm_format_width = snd_pcm_format_width(params_format(params));
return err;
} }
/* hw_free callback */ /* hw_free callback */
@ -248,11 +233,11 @@ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream)
if (chip->spdif_status & IEC958_AES0_NONAUDIO) if (chip->spdif_status & IEC958_AES0_NONAUDIO)
channels = 0; channels = 0;
else else
channels = alsa_stream->channels; channels = runtime->channels;
err = bcm2835_audio_set_params(alsa_stream, channels, err = bcm2835_audio_set_params(alsa_stream, channels,
alsa_stream->params_rate, runtime->rate,
alsa_stream->pcm_format_width); snd_pcm_format_width(runtime->format));
if (err < 0) if (err < 0)
audio_error(" error setting hw params\n"); audio_error(" error setting hw params\n");

4
drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
View File

@ -121,10 +121,6 @@ struct bcm2835_alsa_stream {
int draining; int draining;
int channels;
int params_rate;
int pcm_format_width;
unsigned int pos; unsigned int pos;
unsigned int buffer_size; unsigned int buffer_size;
unsigned int period_size; unsigned int period_size;