ASoC: DaVinci: remove requirement that dma_params is 1st in structure (57512c64) · Commits · 戴 / test

sound/soc/davinci/davinci-i2s.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -98,11 +98,6 @@ enum {
		};

		struct davinci_mcbsp_dev {
		/*
		* dma_params must be first because rtd->dai->cpu_dai->private_data
		* is cast to a pointer of an array of struct davinci_pcm_dma_params in
		* davinci_pcm_open.
		*/
		struct davinci_pcm_dma_params dma_params[2];
		void __iomem *base;
		#define MOD_DSP_A 0
		@@ -549,6 +544,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)
		dev->dma_params[SNDRV_PCM_STREAM_CAPTURE].channel = res->start;

		davinci_i2s_dai.private_data = dev;
		davinci_i2s_dai.dma_data = dev->dma_params;
		ret = snd_soc_register_dai(&davinci_i2s_dai);
		if (ret != 0)
		goto err_free_mem;

+1 −0

Original line number	Diff line number	Diff line
		@@ -904,6 +904,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)

		dma_data->channel = res->start;
		davinci_mcasp_dai[pdata->op_mode].private_data = dev;
		davinci_mcasp_dai[pdata->op_mode].dma_data = dev->dma_params;
		davinci_mcasp_dai[pdata->op_mode].dev = &pdev->dev;
		ret = snd_soc_register_dai(&davinci_mcasp_dai[pdata->op_mode]);

+0 −5

Original line number	Diff line number	Diff line
		@@ -39,11 +39,6 @@ enum {
		};

		struct davinci_audio_dev {
		/*
		* dma_params must be first because rtd->dai->cpu_dai->private_data
		* is cast to a pointer of an array of struct davinci_pcm_dma_params in
		* davinci_pcm_open.
		*/
		struct davinci_pcm_dma_params dma_params[2];
		void __iomem *base;
		int sample_rate;

+4 −3

Original line number	Diff line number	Diff line
		@@ -253,10 +253,11 @@ static int davinci_pcm_open(struct snd_pcm_substream *substream)
		struct davinci_runtime_data *prtd;
		int ret = 0;
		struct snd_soc_pcm_runtime *rtd = substream->private_data;
		struct davinci_pcm_dma_params *pa = rtd->dai->cpu_dai->private_data;
		struct davinci_pcm_dma_params *params = &pa[substream->stream];
		if (!params)
		struct davinci_pcm_dma_params *pa = rtd->dai->cpu_dai->dma_data;
		struct davinci_pcm_dma_params *params;
		if (!pa)
		return -ENODEV;
		params = &pa[substream->stream];

		snd_soc_set_runtime_hwparams(substream, &davinci_pcm_hardware);
		/* ensure that buffer size is a multiple of period size */