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

Commit 10d9e3d9 authored by Joonyoung Shim's avatar Joonyoung Shim Committed by Mark Brown
Browse files

ASoC: twl4030 - Fix build error 



CC      sound/soc/codecs/twl4030.o
sound/soc/codecs/twl4030.c:1400: warning: braces around scalar initializer
sound/soc/codecs/twl4030.c:1400: warning: (near initialization for 'twl4030_dai.ops')
sound/soc/codecs/twl4030.c:1401: error: field name not in record or union initializer
sound/soc/codecs/twl4030.c:1401: error: (near initialization for 'twl4030_dai.ops')
sound/soc/codecs/twl4030.c:1401: warning: initialization from incompatible pointer type
sound/soc/codecs/twl4030.c:1402: error: field name not in record or union initializer
sound/soc/codecs/twl4030.c:1402: error: (near initialization for 'twl4030_dai.ops')
sound/soc/codecs/twl4030.c:1402: warning: excess elements in scalar initializer
sound/soc/codecs/twl4030.c:1402: warning: (near initialization for 'twl4030_dai.ops')
sound/soc/codecs/twl4030.c:1403: error: field name not in record or union initializer
sound/soc/codecs/twl4030.c:1403: error: (near initialization for 'twl4030_dai.ops')
sound/soc/codecs/twl4030.c:1403: warning: excess elements in scalar initializer
sound/soc/codecs/twl4030.c:1403: warning: (near initialization for 'twl4030_dai.ops')

Signed-off-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 26ade896

sound/soc/codecs/twl4030.c

+7 −5
Original line number Diff line number Diff line
@@ -1383,6 +1383,12 @@ static int twl4030_set_dai_fmt(struct snd_soc_dai *codec_dai, 
#define TWL4030_RATES	 (SNDRV_PCM_RATE_8000_48000)

#define TWL4030_FORMATS	 (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FORMAT_S24_LE)



static struct snd_soc_dai_ops twl4030_dai_ops = {

	.hw_params	= twl4030_hw_params,

	.set_sysclk	= twl4030_set_dai_sysclk,

	.set_fmt	= twl4030_set_dai_fmt,

};



struct snd_soc_dai twl4030_dai = {

	.name = "twl4030",

	.playback = {
@@ -1397,11 +1403,7 @@ struct snd_soc_dai twl4030_dai = { 
		.channels_max = 2,

		.rates = TWL4030_RATES,

		.formats = TWL4030_FORMATS,},

	.ops = {

		.hw_params = twl4030_hw_params,

		.set_sysclk = twl4030_set_dai_sysclk,

		.set_fmt = twl4030_set_dai_fmt,

	}

	.ops = &twl4030_dai_ops,

};

EXPORT_SYMBOL_GPL(twl4030_dai);