ASoC: Fix some missing dai_ops conversions (f2a5d6a2) · Commits · e / devices / android_kernel_fairphone_FP5

sound/soc/s3c24xx/s3c64xx-i2s.c

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -177,6 +177,10 @@ static int s3c64xx_i2s_probe(struct platform_device *pdev,
	#define S3C64XX_I2S_FMTS \		#define S3C64XX_I2S_FMTS \
	(SNDRV_PCM_FMTBIT_S8 \| SNDRV_PCM_FMTBIT_S16_LE)		(SNDRV_PCM_FMTBIT_S8 \| SNDRV_PCM_FMTBIT_S16_LE)

			static struct snd_soc_dai_ops s3c64xx_i2s_dai_ops = {
			.set_sysclk = s3c64xx_i2s_set_sysclk,
			};

	struct snd_soc_dai s3c64xx_i2s_dai = {		struct snd_soc_dai s3c64xx_i2s_dai = {
	.name = "s3c64xx-i2s",		.name = "s3c64xx-i2s",
	.id = 0,		.id = 0,
	@@ -193,9 +197,7 @@ struct snd_soc_dai s3c64xx_i2s_dai = {
	.rates = S3C64XX_I2S_RATES,		.rates = S3C64XX_I2S_RATES,
	.formats = S3C64XX_I2S_FMTS,		.formats = S3C64XX_I2S_FMTS,
	},		},
	.ops = {		.ops = &s3c64xx_i2s_dai_ops,
	.set_sysclk = s3c64xx_i2s_set_sysclk,
	},
	};		};
	EXPORT_SYMBOL_GPL(s3c64xx_i2s_dai);		EXPORT_SYMBOL_GPL(s3c64xx_i2s_dai);

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -267,6 +267,10 @@ static int hac_hw_params(struct snd_pcm_substream *substream,
	#define AC97_FMTS \		#define AC97_FMTS \
	SNDRV_PCM_FMTBIT_S16_LE		SNDRV_PCM_FMTBIT_S16_LE

			static struct snd_soc_dai_ops hac_dai_ops = {
			.hw_params = hac_hw_params,
			};

	struct snd_soc_dai sh4_hac_dai[] = {		struct snd_soc_dai sh4_hac_dai[] = {
	{		{
	.name = "HAC0",		.name = "HAC0",
	@@ -284,9 +288,7 @@ struct snd_soc_dai sh4_hac_dai[] = {
	.channels_min = 2,		.channels_min = 2,
	.channels_max = 2,		.channels_max = 2,
	},		},
	.ops = {		.ops = &hac_dai_ops,
	.hw_params = hac_hw_params,
	},
	},		},
	#ifdef CONFIG_CPU_SUBTYPE_SH7760		#ifdef CONFIG_CPU_SUBTYPE_SH7760
	{		{
	@@ -305,9 +307,7 @@ struct snd_soc_dai sh4_hac_dai[] = {
	.channels_min = 2,		.channels_min = 2,
	.channels_max = 2,		.channels_max = 2,
	},		},
	.ops = {		.ops = &hac_dai_ops,
	.hw_params = hac_hw_params,
	},

	},		},
	#endif		#endif