Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next (641783ac) · Commits · e / devices / android_kernel_fairphone_FP5

sound/soc/davinci/davinci-evm.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ struct snd_soc_card_drvdata_davinci {
		static int evm_startup(struct snd_pcm_substream *substream)
		{
		struct snd_soc_pcm_runtime *rtd = substream->private_data;
		struct snd_soc_card *soc_card = rtd->codec->card;
		struct snd_soc_card *soc_card = rtd->card;
		struct snd_soc_card_drvdata_davinci *drvdata =
		snd_soc_card_get_drvdata(soc_card);

		@@ -51,7 +51,7 @@ static int evm_startup(struct snd_pcm_substream *substream)
		static void evm_shutdown(struct snd_pcm_substream *substream)
		{
		struct snd_soc_pcm_runtime *rtd = substream->private_data;
		struct snd_soc_card *soc_card = rtd->codec->card;
		struct snd_soc_card *soc_card = rtd->card;
		struct snd_soc_card_drvdata_davinci *drvdata =
		snd_soc_card_get_drvdata(soc_card);

		@@ -65,8 +65,7 @@ static int evm_hw_params(struct snd_pcm_substream *substream,
		struct snd_soc_pcm_runtime *rtd = substream->private_data;
		struct snd_soc_dai *codec_dai = rtd->codec_dai;
		struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
		struct snd_soc_codec *codec = rtd->codec;
		struct snd_soc_card *soc_card = codec->card;
		struct snd_soc_card *soc_card = rtd->card;
		int ret = 0;
		unsigned sysclk = ((struct snd_soc_card_drvdata_davinci *)
		snd_soc_card_get_drvdata(soc_card))->sysclk;
		@@ -125,7 +124,7 @@ static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd)
		{
		struct snd_soc_card *card = rtd->card;
		struct snd_soc_codec *codec = rtd->codec;
		struct device_node *np = codec->card->dev->of_node;
		struct device_node *np = card->dev->of_node;
		int ret;

		/* Add davinci-evm specific widgets */