Commit af621959 authored by Daniel Baluta's avatar Daniel Baluta Committed by Mark Brown

ASoC: simple_card_utils.h: Fix potential multiple redefinition error

asoc_simple_debug_info and asoc_simple_debug_dai must be static
otherwise we might a compilation error if the compiler decides
not to inline the given function.

Fixes: 0580dde5 ("ASoC: simple-card-utils: add asoc_simple_debug_info()")
Signed-off-by: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Link: https://lore.kernel.org/r/20191009153615.32105-3-daniel.baluta@nxp.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent bcab0588
...@@ -135,7 +135,7 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, ...@@ -135,7 +135,7 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv,
struct link_info *li); struct link_info *li);
#ifdef DEBUG #ifdef DEBUG
inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv, static inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv,
char *name, char *name,
struct asoc_simple_dai *dai) struct asoc_simple_dai *dai)
{ {
...@@ -167,7 +167,7 @@ inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv, ...@@ -167,7 +167,7 @@ inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv,
dev_dbg(dev, "%s clk %luHz\n", name, clk_get_rate(dai->clk)); dev_dbg(dev, "%s clk %luHz\n", name, clk_get_rate(dai->clk));
} }
inline void asoc_simple_debug_info(struct asoc_simple_priv *priv) static inline void asoc_simple_debug_info(struct asoc_simple_priv *priv)
{ {
struct snd_soc_card *card = simple_priv_to_card(priv); struct snd_soc_card *card = simple_priv_to_card(priv);
struct device *dev = simple_priv_to_dev(priv); struct device *dev = simple_priv_to_dev(priv);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment