Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cb132d7 authored by Liam Girdwood's avatar Liam Girdwood Committed by Jaroslav Kysela
Browse files

ALSA: asoc: davinci - merge structs snd_soc_codec_dai and snd_soc_cpu_dai. 



This patch merges struct snd_soc_codec_dai and struct
snd_soc_cpu_dai into struct snd_soc_dai for the DaVinci platform.

Signed-off-by: default avatarLiam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent d37ae539

sound/soc/davinci/davinci-evm.c

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ static int evm_hw_params(struct snd_pcm_substream *substream, 
			 struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai;

	struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai;

	struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;

	struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;

	int ret = 0;



	/* set codec DAI configuration */

sound/soc/davinci/davinci-i2s.c

+7 −7
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static void davinci_mcbsp_stop(struct snd_pcm_substream *substream) 
static int davinci_i2s_startup(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai;

	struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;

	struct davinci_mcbsp_dev *dev = rtd->dai->cpu_dai->private_data;



	cpu_dai->dma_data = dev->dma_params[substream->stream];
@@ -155,7 +155,7 @@ static int davinci_i2s_startup(struct snd_pcm_substream *substream) 
	return 0;

}



static int davinci_i2s_set_dai_fmt(struct snd_soc_cpu_dai *cpu_dai,

static int davinci_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai,

				   unsigned int fmt)

{

	struct davinci_mcbsp_dev *dev = cpu_dai->private_data;
@@ -296,11 +296,11 @@ static int davinci_i2s_trigger(struct snd_pcm_substream *substream, int cmd) 
}



static int davinci_i2s_probe(struct platform_device *pdev,

			     struct snd_soc_cpu_dai *dai)

			     struct snd_soc_dai *dai)

{

	struct snd_soc_device *socdev = platform_get_drvdata(pdev);

	struct snd_soc_machine *machine = socdev->machine;

	struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[pdev->id].cpu_dai;

	struct snd_soc_dai *cpu_dai = machine->dai_link[pdev->id].cpu_dai;

	struct davinci_mcbsp_dev *dev;

	struct resource *mem, *ioarea;

	struct evm_snd_platform_data *pdata;
@@ -358,11 +358,11 @@ static int davinci_i2s_probe(struct platform_device *pdev, 
}



static void davinci_i2s_remove(struct platform_device *pdev,

			       struct snd_soc_cpu_dai *dai)

			       struct snd_soc_dai *dai)

{

	struct snd_soc_device *socdev = platform_get_drvdata(pdev);

	struct snd_soc_machine *machine = socdev->machine;

	struct snd_soc_cpu_dai *cpu_dai = machine->dai_link[pdev->id].cpu_dai;

	struct snd_soc_dai *cpu_dai = machine->dai_link[pdev->id].cpu_dai;

	struct davinci_mcbsp_dev *dev = cpu_dai->private_data;

	struct resource *mem;
@@ -378,7 +378,7 @@ static void davinci_i2s_remove(struct platform_device *pdev, 


#define DAVINCI_I2S_RATES	SNDRV_PCM_RATE_8000_96000



struct snd_soc_cpu_dai davinci_i2s_dai = {

struct snd_soc_dai davinci_i2s_dai = {

	.name = "davinci-i2s",

	.id = 0,

	.type = SND_SOC_DAI_I2S,

sound/soc/davinci/davinci-i2s.h

+1 −1
Original line number Diff line number Diff line
@@ -12,6 +12,6 @@ 
#ifndef _DAVINCI_I2S_H

#define _DAVINCI_I2S_H



extern struct snd_soc_cpu_dai davinci_i2s_dai;

extern struct snd_soc_dai davinci_i2s_dai;



#endif

sound/soc/davinci/davinci-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static void davinci_pcm_free(struct snd_pcm *pcm) 
static u64 davinci_pcm_dmamask = 0xffffffff;



static int davinci_pcm_new(struct snd_card *card,

			   struct snd_soc_codec_dai *dai, struct snd_pcm *pcm)

			   struct snd_soc_dai *dai, struct snd_pcm *pcm)

{

	int ret;