asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: Intel: mfld-pcm rename period callback arg

Browse source 
The argument was called mad_substream which is no longer apt as older driver
is not used anymore so rename as arg

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Vinod Koul 2014-06-13 18:03:52 +05:30 committed by Mark Brown
parent 6cc0f4e639
commit 9daa5bd34f
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sound/soc/intel/sst-mfld-platform-pcm.c
View file

@ -192,9 +192,9 @@ static int sst_platform_alloc_stream(struct snd_pcm_substream *substream)
return ret_val;
}
static void sst_period_elapsed(void *mad_substream)
static void sst_period_elapsed(void *arg)
{
struct snd_pcm_substream *substream = mad_substream;
struct snd_pcm_substream *substream = arg;
struct sst_runtime_stream *stream;
int status;
@ -218,7 +218,7 @@ static int sst_platform_init_stream(struct snd_pcm_substream *substream)
pr_debug("setting buffer ptr param\n");
sst_set_stream_status(stream, SST_PLATFORM_INIT);
stream->stream_info.period_elapsed = sst_period_elapsed;
stream->stream_info.mad_substream = substream;
stream->stream_info.arg = substream;
stream->stream_info.buffer_ptr = 0;
stream->stream_info.sfreq = substream->runtime->rate;
ret_val = stream->ops->device_control(
@ -255,7 +255,7 @@ static int sst_media_open(struct snd_pcm_substream *substream,
stream->stream_info.str_id = 0;
stream->stream_info.mad_substream = substream;
stream->stream_info.arg = substream;
/* allocate memory for SST API set */
runtime->private_data = stream;
@ -363,7 +363,7 @@ static int sst_platform_pcm_trigger(struct snd_pcm_substream *substream,
pr_debug("sst: Trigger Start\n");
str_cmd = SST_SND_START;
status = SST_PLATFORM_RUNNING;
stream->stream_info.mad_substream = substream;
stream->stream_info.arg = substream;
break;
case SNDRV_PCM_TRIGGER_STOP:
pr_debug("sst: in stop\n");

4
sound/soc/intel/sst-mfld-platform.h
View file

@ -39,8 +39,8 @@ extern struct sst_device *sst;
struct pcm_stream_info {
int str_id;
void *mad_substream;
void (*period_elapsed) (void *mad_substream);
void *arg;
void (*period_elapsed) (void *arg);
unsigned long long buffer_ptr;
int sfreq;
};