ASoC: simple_card_utils.h: Fix two potential compilation errors
cover ASoC: simple_card_utils.h: Fix two potential compilation errors
For this to happen we symbol DEBUG to be defined.
Daniel Baluta (2):
ASoC: simple_card_utils.h: Add missing include
ASoC: Fix potential multiple redefinition error
include/sound/simple_card_utils.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 ASoC: simple_card_utils.h: Add missing include
When debug is enabled compiler cannot find the definition of clk_get_rate resulting in the following error:
./include/sound/simple_card_utils.h:168:40: note: previous implicit declaration of ‘clk_get_rate’ was here
dev_dbg(dev, "%s clk %luHz\n", name, clk_get_rate(dai->clk));./include/sound/simple_card_utils.h:168:3: note: in expansion of macro ‘dev_dbg’
dev_dbg(dev, "%s clk %luHz\n", name, clk_get_rate(dai->clk));
Fix this by including the appropriate header.
--- include/sound/simple_card_utils.h | 1 + 1 file changed, 1 insertion(+)
include/sound/simple_card_utils.h +1 -0
@@ -8,6 +8,7 @@#ifndef __SIMPLE_CARD_UTILS_H#define __SIMPLE_CARD_UTILS_H +#include <linux/clk.h> #include <sound/soc.h> #define asoc_simple_init_hp (card, sjack, prefix) \
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "ASoC: simple_card_utils.h: Add missing include" to the asoc tree
The patch
ASoC: simple_card_utils.h: Add missing include
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.5
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
From 4bbee14d8e5487e3d2662138e3767cf4678cdf57 Mon Sep 17 00:00:00 2001
From: Daniel Baluta <[email protected]>
Date: Wed, 9 Oct 2019 18:36:14 +0300
Subject: [PATCH] ASoC: simple_card_utils.h: Add missing include
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
When debug is enabled compiler cannot find the definition of clk_get_rate resulting in the following error:
./include/sound/simple_card_utils.h:168:40: note: previous implicit declaration of ‘clk_get_rate’ was here
dev_dbg(dev, "%s clk %luHz\n", name, clk_get_rate(dai->clk));./include/sound/simple_card_utils.h:168:3: note: in expansion of macro ‘dev_dbg’
dev_dbg(dev, "%s clk %luHz\n", name, clk_get_rate(dai->clk));
Fix this by including the appropriate header.
--- include/sound/simple_card_utils.h | 1 + 1 file changed, 1 insertion(+)
include/sound/simple_card_utils.h +1 -0
@@ -8,6 +8,7 @@#ifndef __SIMPLE_CARD_UTILS_H#define __SIMPLE_CARD_UTILS_H +#include <linux/clk.h> #include <sound/soc.h> #define asoc_simple_init_hp (card, sjack, prefix) \
Signature · 1 line
2.20.1
PATCH 2/2 ASoC: simple_card_utils.h: Fix potential multiple redefinition error
In reply to Daniel Balutaasoc_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.
--- include/sound/simple_card_utils.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
include/sound/simple_card_utils.h +4 -4
@@ -136,9 +136,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);
@@ -168,7 +168,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);
Signature · 1 line
2.17.1
Mark Brown
maintainerApplied "ASoC: simple_card_utils.h: Fix potential multiple redefinition error" to the asoc tree
The patch
ASoC: simple_card_utils.h: Fix potential multiple redefinition error
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.4
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
From af6219590b541418d3192e9bfa03989834ca0e78 Mon Sep 17 00:00:00 2001
From: Daniel Baluta <[email protected]>
Date: Wed, 9 Oct 2019 18:36:15 +0300
Subject: [PATCH] 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.
--- include/sound/simple_card_utils.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
include/sound/simple_card_utils.h +4 -4
@@ -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);
Signature · 1 line
2.20.1
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [alsa-devel] [PATCH 2/2] ASoC: simple_card_utils.h: Fix potential multiple redefinition error
Hi
Quoted 7 lines
asoc_simple_debug_infoandasoc_simple_debug_daimust 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 <[email protected]>---
Thank you for your help !!
Best regards
---
Kuninori Morimoto