aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2014-06-13 08:33:52 -0400
committerMark Brown <broonie@linaro.org>2014-06-21 11:31:00 -0400
commit9daa5bd34f84e43f23ce996d43da5f39348ae8fd (patch)
tree7d7097239395a36bb3d07737c63e70b3c181c451
parent6cc0f4e63994a2b77fb6cd7c3bc1e25b7bdb9881 (diff)
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: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/intel/sst-mfld-platform-pcm.c10
-rw-r--r--sound/soc/intel/sst-mfld-platform.h4
2 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/intel/sst-mfld-platform-pcm.c b/sound/soc/intel/sst-mfld-platform-pcm.c
index 0d46005752bc..4528946f5e9e 100644
--- a/sound/soc/intel/sst-mfld-platform-pcm.c
+++ b/sound/soc/intel/sst-mfld-platform-pcm.c
@@ -192,9 +192,9 @@ static int sst_platform_alloc_stream(struct snd_pcm_substream *substream)
192 return ret_val; 192 return ret_val;
193} 193}
194 194
195static void sst_period_elapsed(void *mad_substream) 195static void sst_period_elapsed(void *arg)
196{ 196{
197 struct snd_pcm_substream *substream = mad_substream; 197 struct snd_pcm_substream *substream = arg;
198 struct sst_runtime_stream *stream; 198 struct sst_runtime_stream *stream;
199 int status; 199 int status;
200 200
@@ -218,7 +218,7 @@ static int sst_platform_init_stream(struct snd_pcm_substream *substream)
218 pr_debug("setting buffer ptr param\n"); 218 pr_debug("setting buffer ptr param\n");
219 sst_set_stream_status(stream, SST_PLATFORM_INIT); 219 sst_set_stream_status(stream, SST_PLATFORM_INIT);
220 stream->stream_info.period_elapsed = sst_period_elapsed; 220 stream->stream_info.period_elapsed = sst_period_elapsed;
221 stream->stream_info.mad_substream = substream; 221 stream->stream_info.arg = substream;
222 stream->stream_info.buffer_ptr = 0; 222 stream->stream_info.buffer_ptr = 0;
223 stream->stream_info.sfreq = substream->runtime->rate; 223 stream->stream_info.sfreq = substream->runtime->rate;
224 ret_val = stream->ops->device_control( 224 ret_val = stream->ops->device_control(
@@ -255,7 +255,7 @@ static int sst_media_open(struct snd_pcm_substream *substream,
255 255
256 stream->stream_info.str_id = 0; 256 stream->stream_info.str_id = 0;
257 257
258 stream->stream_info.mad_substream = substream; 258 stream->stream_info.arg = substream;
259 /* allocate memory for SST API set */ 259 /* allocate memory for SST API set */
260 runtime->private_data = stream; 260 runtime->private_data = stream;
261 261
@@ -363,7 +363,7 @@ static int sst_platform_pcm_trigger(struct snd_pcm_substream *substream,
363 pr_debug("sst: Trigger Start\n"); 363 pr_debug("sst: Trigger Start\n");
364 str_cmd = SST_SND_START; 364 str_cmd = SST_SND_START;
365 status = SST_PLATFORM_RUNNING; 365 status = SST_PLATFORM_RUNNING;
366 stream->stream_info.mad_substream = substream; 366 stream->stream_info.arg = substream;
367 break; 367 break;
368 case SNDRV_PCM_TRIGGER_STOP: 368 case SNDRV_PCM_TRIGGER_STOP:
369 pr_debug("sst: in stop\n"); 369 pr_debug("sst: in stop\n");
diff --git a/sound/soc/intel/sst-mfld-platform.h b/sound/soc/intel/sst-mfld-platform.h
index 6c5e7dc49e3c..6d929c7d7bbb 100644
--- a/sound/soc/intel/sst-mfld-platform.h
+++ b/sound/soc/intel/sst-mfld-platform.h
@@ -39,8 +39,8 @@ extern struct sst_device *sst;
39 39
40struct pcm_stream_info { 40struct pcm_stream_info {
41 int str_id; 41 int str_id;
42 void *mad_substream; 42 void *arg;
43 void (*period_elapsed) (void *mad_substream); 43 void (*period_elapsed) (void *arg);
44 unsigned long long buffer_ptr; 44 unsigned long long buffer_ptr;
45 int sfreq; 45 int sfreq;
46}; 46};