diff mbox

[v6,09/10] ASoC: Intel: mrfld: Use snd_soc_dai_get_drvdata to derive drv data

Message ID 1410255693-6958-10-git-send-email-subhransu.s.prusty@intel.com (mailing list archive)
State Accepted
Commit 6df5d768050f31d810dd3ba0ad8210922c3e9b6d
Headers show

Commit Message

Subhransu S. Prusty Sept. 9, 2014, 9:41 a.m. UTC 
Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
 sound/soc/intel/sst-mfld-platform-pcm.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Mark Brown Sept. 16, 2014, 11:40 p.m. UTC | #1 
On Tue, Sep 09, 2014 at 03:11:32PM +0530, Subhransu S. Prusty wrote:
> Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
> Signed-off-by: Vinod Koul <vinod.koul@intel.com>

Applied, thanks.  Random cleanups like this with no interedependencies
should be pulled towards the front of the series.
diff mbox

Patch

diff --git a/sound/soc/intel/sst-mfld-platform-pcm.c b/sound/soc/intel/sst-mfld-platform-pcm.c
index 5a9e84c..75eb962 100644
--- a/sound/soc/intel/sst-mfld-platform-pcm.c
+++ b/sound/soc/intel/sst-mfld-platform-pcm.c
@@ -228,7 +228,7 @@  int sst_fill_stream_params(void *substream,
 }
 
 static int sst_platform_alloc_stream(struct snd_pcm_substream *substream,
-		struct snd_soc_platform *platform)
+		struct snd_soc_dai *dai)
 {
 	struct sst_runtime_stream *stream =
 			substream->runtime->private_data;
@@ -236,7 +236,7 @@  static int sst_platform_alloc_stream(struct snd_pcm_substream *substream,
 	struct snd_sst_params str_params = {0};
 	struct snd_sst_alloc_params_ext alloc_params = {0};
 	int ret_val = 0;
-	struct sst_data *ctx = snd_soc_platform_get_drvdata(platform);
+	struct sst_data *ctx = snd_soc_dai_get_drvdata(dai);
 
 	/* set codec params and inform SST driver the same */
 	sst_fill_pcm_params(substream, &param);
@@ -369,10 +369,10 @@  static void sst_media_close(struct snd_pcm_substream *substream,
 	kfree(stream);
 }
 
-static inline unsigned int get_current_pipe_id(struct snd_soc_platform *platform,
+static inline unsigned int get_current_pipe_id(struct snd_soc_dai *dai,
 					       struct snd_pcm_substream *substream)
 {
-	struct sst_data *sst = snd_soc_platform_get_drvdata(platform);
+	struct sst_data *sst = snd_soc_dai_get_drvdata(dai);
 	struct sst_dev_stream_map *map = sst->pdata->pdev_strm_map;
 	struct sst_runtime_stream *stream =
 			substream->runtime->private_data;
@@ -381,7 +381,7 @@  static inline unsigned int get_current_pipe_id(struct snd_soc_platform *platform
 
 	pipe_id = map[str_id].device_id;
 
-	dev_dbg(platform->dev, "got pipe_id = %#x for str_id = %d\n",
+	dev_dbg(dai->dev, "got pipe_id = %#x for str_id = %d\n",
 			pipe_id, str_id);
 	return pipe_id;
 }
@@ -399,7 +399,7 @@  static int sst_media_prepare(struct snd_pcm_substream *substream,
 		return ret_val;
 	}
 
-	ret_val = sst_platform_alloc_stream(substream, dai->platform);
+	ret_val = sst_platform_alloc_stream(substream, dai);
 	if (ret_val <= 0)
 		return ret_val;
 	snprintf(substream->pcm->id, sizeof(substream->pcm->id),