diff options
| author | Daniel Baluta <daniel.baluta@nxp.com> | 2019-10-09 18:36:15 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-10-09 18:02:34 +0100 |
| commit | af6219590b541418d3192e9bfa03989834ca0e78 (patch) | |
| tree | 210b6c052c78dfae2c53f46e68e478456ba6ed87 | |
| parent | bcab05880f9306e94531b0009c627421db110a74 (diff) | |
| download | linux-af6219590b541418d3192e9bfa03989834ca0e78.tar.gz linux-af6219590b541418d3192e9bfa03989834ca0e78.tar.bz2 linux-af6219590b541418d3192e9bfa03989834ca0e78.zip | |
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: 0580dde59438686d ("ASoC: simple-card-utils: add asoc_simple_debug_info()")
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Link: https://lore.kernel.org/r/20191009153615.32105-3-daniel.baluta@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | include/sound/simple_card_utils.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index 985a5f583de4..31f76b6abf71 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -135,9 +135,9 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, struct link_info *li); #ifdef DEBUG -inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv, - char *name, - struct asoc_simple_dai *dai) +static inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv, + char *name, + struct asoc_simple_dai *dai) { struct device *dev = simple_priv_to_dev(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)); } -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 device *dev = simple_priv_to_dev(priv); |