* [alsa-devel] [PATCH 0/2] ASoC: simple_card_utils.h: Fix two potential compilation errors @ 2019-10-09 15:36 Daniel Baluta 2019-10-09 15:36 ` Daniel Baluta ` (3 more replies) 0 siblings, 4 replies; 8+ messages in thread From: Daniel Baluta @ 2019-10-09 15:36 UTC (permalink / raw) To: perex, tiwai, broonie Cc: alsa-devel, Daniel Baluta, linux-kernel, kuninori.morimoto.gx, linux-imx 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(-) -- 2.17.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply [flat|nested] 8+ messages in thread
* [alsa-devel] [PATCH 0/2] ASoC: simple_card_utils.h: Fix two potential compilation errors 2019-10-09 15:36 [alsa-devel] [PATCH 0/2] ASoC: simple_card_utils.h: Fix two potential compilation errors Daniel Baluta @ 2019-10-09 15:36 ` Daniel Baluta 2019-10-09 15:36 ` [alsa-devel] [PATCH 1/2] ASoC: simple_card_utils.h: Add missing include Daniel Baluta ` (2 subsequent siblings) 3 siblings, 0 replies; 8+ messages in thread From: Daniel Baluta @ 2019-10-09 15:36 UTC (permalink / raw) To: perex, tiwai, broonie Cc: alsa-devel, Daniel Baluta, linux-kernel, kuninori.morimoto.gx, linux-imx 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(-) -- 2.17.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply [flat|nested] 8+ messages in thread
* [alsa-devel] [PATCH 1/2] ASoC: simple_card_utils.h: Add missing include 2019-10-09 15:36 [alsa-devel] [PATCH 0/2] ASoC: simple_card_utils.h: Fix two potential compilation errors Daniel Baluta 2019-10-09 15:36 ` Daniel Baluta @ 2019-10-09 15:36 ` Daniel Baluta 2019-10-09 17:21 ` [alsa-devel] Applied "ASoC: simple_card_utils.h: Add missing include" to the asoc tree Mark Brown 2019-10-09 15:36 ` [alsa-devel] [PATCH 2/2] ASoC: simple_card_utils.h: Fix potential multiple redefinition error Daniel Baluta [not found] ` <5da2a24b.1c69fb81.b7663.c273SMTPIN_ADDED_BROKEN@mx.google.com> 3 siblings, 1 reply; 8+ messages in thread From: Daniel Baluta @ 2019-10-09 15:36 UTC (permalink / raw) To: perex, tiwai, broonie Cc: alsa-devel, Daniel Baluta, linux-kernel, kuninori.morimoto.gx, linux-imx 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. Fixes: 0580dde59438686d ("ASoC: simple-card-utils: add asoc_simple_debug_info()") Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com> --- include/sound/simple_card_utils.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index 985a5f583de4..293ff8115960 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -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) \ -- 2.17.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [alsa-devel] Applied "ASoC: simple_card_utils.h: Add missing include" to the asoc tree 2019-10-09 15:36 ` [alsa-devel] [PATCH 1/2] ASoC: simple_card_utils.h: Add missing include Daniel Baluta @ 2019-10-09 17:21 ` Mark Brown 0 siblings, 0 replies; 8+ messages in thread From: Mark Brown @ 2019-10-09 17:21 UTC (permalink / raw) To: Daniel Baluta Cc: alsa-devel, kuninori.morimoto.gx, tiwai, linux-kernel, Mark Brown, linux-imx [-- Attachment #1: Type: text/plain, Size: 2468 bytes --] 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 <daniel.baluta@nxp.com> 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. 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-2-daniel.baluta@nxp.com Signed-off-by: Mark Brown <broonie@kernel.org> --- include/sound/simple_card_utils.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index 985a5f583de4..293ff8115960 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -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) \ -- 2.20.1 [-- Attachment #2: Type: text/plain, Size: 161 bytes --] _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [alsa-devel] [PATCH 2/2] ASoC: simple_card_utils.h: Fix potential multiple redefinition error 2019-10-09 15:36 [alsa-devel] [PATCH 0/2] ASoC: simple_card_utils.h: Fix two potential compilation errors Daniel Baluta 2019-10-09 15:36 ` Daniel Baluta 2019-10-09 15:36 ` [alsa-devel] [PATCH 1/2] ASoC: simple_card_utils.h: Add missing include Daniel Baluta @ 2019-10-09 15:36 ` Daniel Baluta 2019-10-09 15:36 ` Daniel Baluta 2019-10-09 17:21 ` [alsa-devel] Applied "ASoC: simple_card_utils.h: Fix potential multiple redefinition error" to the asoc tree Mark Brown [not found] ` <5da2a24b.1c69fb81.b7663.c273SMTPIN_ADDED_BROKEN@mx.google.com> 3 siblings, 2 replies; 8+ messages in thread From: Daniel Baluta @ 2019-10-09 15:36 UTC (permalink / raw) To: perex, tiwai, broonie Cc: alsa-devel, Daniel Baluta, linux-kernel, kuninori.morimoto.gx, linux-imx 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> --- include/sound/simple_card_utils.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index 293ff8115960..bbdd1542d6f1 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -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); -- 2.17.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [alsa-devel] [PATCH 2/2] ASoC: simple_card_utils.h: Fix potential multiple redefinition error 2019-10-09 15:36 ` [alsa-devel] [PATCH 2/2] ASoC: simple_card_utils.h: Fix potential multiple redefinition error Daniel Baluta @ 2019-10-09 15:36 ` Daniel Baluta 2019-10-09 17:21 ` [alsa-devel] Applied "ASoC: simple_card_utils.h: Fix potential multiple redefinition error" to the asoc tree Mark Brown 1 sibling, 0 replies; 8+ messages in thread From: Daniel Baluta @ 2019-10-09 15:36 UTC (permalink / raw) To: perex, tiwai, broonie Cc: alsa-devel, Daniel Baluta, linux-kernel, kuninori.morimoto.gx, linux-imx 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> --- include/sound/simple_card_utils.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index 293ff8115960..bbdd1542d6f1 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -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); -- 2.17.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [alsa-devel] Applied "ASoC: simple_card_utils.h: Fix potential multiple redefinition error" to the asoc tree 2019-10-09 15:36 ` [alsa-devel] [PATCH 2/2] ASoC: simple_card_utils.h: Fix potential multiple redefinition error Daniel Baluta 2019-10-09 15:36 ` Daniel Baluta @ 2019-10-09 17:21 ` Mark Brown 1 sibling, 0 replies; 8+ messages in thread From: Mark Brown @ 2019-10-09 17:21 UTC (permalink / raw) To: Daniel Baluta Cc: alsa-devel, kuninori.morimoto.gx, tiwai, linux-kernel, Mark Brown, linux-imx 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 <daniel.baluta@nxp.com> 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. 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> --- include/sound/simple_card_utils.h | 8 ++++---- 1 file 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); -- 2.20.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply related [flat|nested] 8+ messages in thread
[parent not found: <5da2a24b.1c69fb81.b7663.c273SMTPIN_ADDED_BROKEN@mx.google.com>]
* Re: [alsa-devel] [PATCH 2/2] ASoC: simple_card_utils.h: Fix potential multiple redefinition error [not found] ` <5da2a24b.1c69fb81.b7663.c273SMTPIN_ADDED_BROKEN@mx.google.com> @ 2019-10-15 0:43 ` Kuninori Morimoto 0 siblings, 0 replies; 8+ messages in thread From: Kuninori Morimoto @ 2019-10-15 0:43 UTC (permalink / raw) To: Daniel Baluta; +Cc: alsa-devel, linux-kernel, tiwai, broonie, linux-imx Hi > 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> > --- Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Thank you for your help !! Best regards --- Kuninori Morimoto _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-10-15 0:44 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-10-09 15:36 [alsa-devel] [PATCH 0/2] ASoC: simple_card_utils.h: Fix two potential compilation errors Daniel Baluta 2019-10-09 15:36 ` Daniel Baluta 2019-10-09 15:36 ` [alsa-devel] [PATCH 1/2] ASoC: simple_card_utils.h: Add missing include Daniel Baluta 2019-10-09 17:21 ` [alsa-devel] Applied "ASoC: simple_card_utils.h: Add missing include" to the asoc tree Mark Brown 2019-10-09 15:36 ` [alsa-devel] [PATCH 2/2] ASoC: simple_card_utils.h: Fix potential multiple redefinition error Daniel Baluta 2019-10-09 15:36 ` Daniel Baluta 2019-10-09 17:21 ` [alsa-devel] Applied "ASoC: simple_card_utils.h: Fix potential multiple redefinition error" to the asoc tree Mark Brown [not found] ` <5da2a24b.1c69fb81.b7663.c273SMTPIN_ADDED_BROKEN@mx.google.com> 2019-10-15 0:43 ` [alsa-devel] [PATCH 2/2] ASoC: simple_card_utils.h: Fix potential multiple redefinition error Kuninori Morimoto
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).