diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-10-21 15:05:26 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-10-21 15:05:26 +0300 |
| commit | c8d2dcb3e94106395811ac86681a4439c560cbca (patch) | |
| tree | 8bcb8096565bef5a8470e7acb1979673bc8c8c68 /include/sound | |
| parent | 83629532ce45ef9df1f297b419b9ea112045685d (diff) | |
| parent | 95a32c98055f664f9b3f34c41e153d4dcedd0eff (diff) | |
| download | linux-c8d2dcb3e94106395811ac86681a4439c560cbca.tar.xz | |
Merge tag 'asoc-fix-v5.4-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.4
A collection of fixes that have arrived since the merge window. There
are a small number of core fixes here but they are smaller ones around
error handling.
Diffstat (limited to 'include/sound')
| -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); |