Commit 9daa5bd3 authored by Vinod Koul's avatar Vinod Koul Committed by Mark Brown

ASoC: Intel: mfld-pcm rename period callback arg

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: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 6cc0f4e6
...@@ -192,9 +192,9 @@ static int sst_platform_alloc_stream(struct snd_pcm_substream *substream) ...@@ -192,9 +192,9 @@ static int sst_platform_alloc_stream(struct snd_pcm_substream *substream)
return ret_val; 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; struct sst_runtime_stream *stream;
int status; int status;
...@@ -218,7 +218,7 @@ static int sst_platform_init_stream(struct snd_pcm_substream *substream) ...@@ -218,7 +218,7 @@ static int sst_platform_init_stream(struct snd_pcm_substream *substream)
pr_debug("setting buffer ptr param\n"); pr_debug("setting buffer ptr param\n");
sst_set_stream_status(stream, SST_PLATFORM_INIT); sst_set_stream_status(stream, SST_PLATFORM_INIT);
stream->stream_info.period_elapsed = sst_period_elapsed; 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.buffer_ptr = 0;
stream->stream_info.sfreq = substream->runtime->rate; stream->stream_info.sfreq = substream->runtime->rate;
ret_val = stream->ops->device_control( ret_val = stream->ops->device_control(
...@@ -255,7 +255,7 @@ static int sst_media_open(struct snd_pcm_substream *substream, ...@@ -255,7 +255,7 @@ static int sst_media_open(struct snd_pcm_substream *substream,
stream->stream_info.str_id = 0; stream->stream_info.str_id = 0;
stream->stream_info.mad_substream = substream; stream->stream_info.arg = substream;
/* allocate memory for SST API set */ /* allocate memory for SST API set */
runtime->private_data = stream; runtime->private_data = stream;
...@@ -363,7 +363,7 @@ static int sst_platform_pcm_trigger(struct snd_pcm_substream *substream, ...@@ -363,7 +363,7 @@ static int sst_platform_pcm_trigger(struct snd_pcm_substream *substream,
pr_debug("sst: Trigger Start\n"); pr_debug("sst: Trigger Start\n");
str_cmd = SST_SND_START; str_cmd = SST_SND_START;
status = SST_PLATFORM_RUNNING; status = SST_PLATFORM_RUNNING;
stream->stream_info.mad_substream = substream; stream->stream_info.arg = substream;
break; break;
case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_STOP:
pr_debug("sst: in stop\n"); pr_debug("sst: in stop\n");
......
...@@ -39,8 +39,8 @@ extern struct sst_device *sst; ...@@ -39,8 +39,8 @@ extern struct sst_device *sst;
struct pcm_stream_info { struct pcm_stream_info {
int str_id; int str_id;
void *mad_substream; void *arg;
void (*period_elapsed) (void *mad_substream); void (*period_elapsed) (void *arg);
unsigned long long buffer_ptr; unsigned long long buffer_ptr;
int sfreq; int sfreq;
}; };
......
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