From: Mark Brown <broonie@kernel.org> To: Daniel Baluta <daniel.baluta@nxp.com> Cc: alsa-devel@alsa-project.org, broonie@kernel.org, kuninori.morimoto.gx@renesas.com, linux-imx@nxp.com, linux-kernel@vger.kernel.org, Mark Brown <broonie@kernel.org>, perex@perex.cz, tiwai@suse.com Subject: Applied "ASoC: simple_card_utils.h: Fix potential multiple redefinition error" to the asoc tree Date: Wed, 9 Oct 2019 18:21:48 +0100 (BST) [thread overview] Message-ID: <20191009172148.77012D03ED5@fitzroy.sirena.org.uk> (raw) In-Reply-To: <20191009153615.32105-3-daniel.baluta@nxp.com> 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
WARNING: multiple messages have this Message-ID (diff)
From: Mark Brown <broonie@kernel.org> To: Daniel Baluta <daniel.baluta@nxp.com> Cc: alsa-devel@alsa-project.org, kuninori.morimoto.gx@renesas.com, tiwai@suse.com, linux-kernel@vger.kernel.org, Mark Brown <broonie@kernel.org>, linux-imx@nxp.com Subject: [alsa-devel] Applied "ASoC: simple_card_utils.h: Fix potential multiple redefinition error" to the asoc tree Date: Wed, 9 Oct 2019 18:21:48 +0100 (BST) [thread overview] Message-ID: <20191009172148.77012D03ED5@fitzroy.sirena.org.uk> (raw) In-Reply-To: <20191009153615.32105-3-daniel.baluta@nxp.com> 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
next prev parent reply other threads:[~2019-10-09 17:22 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-09 15:36 [PATCH 0/2] ASoC: simple_card_utils.h: Fix two potential compilation errors Daniel Baluta 2019-10-09 15:36 ` [alsa-devel] " Daniel Baluta 2019-10-09 15:36 ` Daniel Baluta 2019-10-09 15:36 ` [PATCH 1/2] ASoC: simple_card_utils.h: Add missing include Daniel Baluta 2019-10-09 15:36 ` [alsa-devel] " Daniel Baluta 2019-10-09 17:21 ` Applied "ASoC: simple_card_utils.h: Add missing include" to the asoc tree Mark Brown 2019-10-09 17:21 ` [alsa-devel] " Mark Brown 2019-10-09 15:36 ` [PATCH 2/2] ASoC: simple_card_utils.h: Fix potential multiple redefinition error Daniel Baluta 2019-10-09 15:36 ` [alsa-devel] " Daniel Baluta 2019-10-09 15:36 ` Daniel Baluta 2019-10-09 17:21 ` Mark Brown [this message] 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 2019-10-15 0:43 ` Kuninori Morimoto
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191009172148.77012D03ED5@fitzroy.sirena.org.uk \ --to=broonie@kernel.org \ --cc=alsa-devel@alsa-project.org \ --cc=daniel.baluta@nxp.com \ --cc=kuninori.morimoto.gx@renesas.com \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=perex@perex.cz \ --cc=tiwai@suse.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.