From 78822e36dca8fe8bc83e7847508891b59f3f8603 Mon Sep 17 00:00:00 2001 From: John Hsu Date: Tue, 23 Aug 2016 16:02:49 +0800 Subject: ASoC: nau8810: fix compile warning in loopback switch control Thank Stephen Rothwell for the message. The patch is to fix the following compile error. sound/soc/codecs/nau8810.c:441:3: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] SND_SOC_DAPM_SWITCH("Digital Loopback", SND_SOC_NOPM, 0, 0, &nau8810_loopback), ^ sound/soc/codecs/nau8810.c:441:3: note: (near initialization for 'nau8810_dapm_widgets[11].kcontrol_news') Signed-off-by: John Hsu Signed-off-by: Mark Brown --- sound/soc/codecs/nau8810.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sound') diff --git a/sound/soc/codecs/nau8810.c b/sound/soc/codecs/nau8810.c index 7617ddad5601..f9bcdc33df84 100644 --- a/sound/soc/codecs/nau8810.c +++ b/sound/soc/codecs/nau8810.c @@ -391,10 +391,9 @@ static const struct snd_kcontrol_new nau8810_mic_boost_controls = NAU8810_PMICBSTGAIN_SFT, 0x7, 0); /* Loopback Switch */ -static const struct snd_kcontrol_new nau8810_loopback[] = { +static const struct snd_kcontrol_new nau8810_loopback = SOC_DAPM_SINGLE("Switch", NAU8810_REG_COMP, - NAU8810_ADDAP_SFT, 1, 0), -}; + NAU8810_ADDAP_SFT, 1, 0); static int check_mclk_select_pll(struct snd_soc_dapm_widget *source, struct snd_soc_dapm_widget *sink) -- cgit v1.2.3