ASoC: Intel: mrfld: Use snd_soc_dai_get_drvdata to derive drv data
authorSubhransu S. Prusty <subhransu.s.prusty@intel.com>
Tue, 9 Sep 2014 09:41:32 +0000 (15:11 +0530)
committerMark Brown <broonie@kernel.org>
Tue, 16 Sep 2014 23:39:42 +0000 (16:39 -0700)
Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/sst-mfld-platform-pcm.c

index 9906b7c1c2e13e9764999c63691cf9416edaf88c..8e1b2c14291c39d59178f45ac8cf242359387381 100644 (file)
@@ -252,7 +252,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;
@@ -260,7 +260,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);
@@ -377,10 +377,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;
@@ -389,7 +389,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;
 }
@@ -407,7 +407,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),