From: Xiubo Li
Date: Mon, 18 Aug 2014 07:00:15 +0000 (+0800)
Subject: ASoC: simple-card: Fix the compile warning.
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8ea21348868f37f5b2e6ebbaf336d2a415b2b9ff;p=openwrt%2Fstaging%2Fblogic.git
ASoC: simple-card: Fix the compile warning.
sound/soc/generic/simple-card.c: In function simple_card_dai_link_of:
sound/soc/generic/simple-card.c:198:10: warning: passing argument 3 of
asoc_simple_card_sub_parse_of from incompatible pointer type [enabled by default]
&dai_link->cpu_dai_name);
^
sound/soc/generic/simple-card.c:112:1: note: expected const struct device_node **
but argument is of type struct device_node **
asoc_simple_card_sub_parse_of(struct device_node *np,
^
sound/soc/generic/simple-card.c:229:10: warning: passing argument 3 of
asoc_simple_card_sub_parse_of from incompatible pointer type [enabled by default]
&dai_link->codec_dai_name);
^
sound/soc/generic/simple-card.c:112:1: note: expected const struct device_node **
but argument is of type struct device_node **
asoc_simple_card_sub_parse_of(struct device_node *np,
^
Since the asoc_simple_card_sub_parse_of() is used in simple-card module only,
and the third argument is just used to get the node ponters address, so there is
no need it must to be 'const' type.
Signed-off-by: Xiubo Li
Signed-off-by: Mark Brown
---
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 159e517fa09a..21b0ea24bc1d 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -111,7 +111,7 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
static int
asoc_simple_card_sub_parse_of(struct device_node *np,
struct asoc_simple_dai *dai,
- const struct device_node **p_node,
+ struct device_node **p_node,
const char **name)
{
struct device_node *node;