* [PATCH] ASoC: Fix the include guard used for include/sound/wm8904.h
@ 2022-08-06 15:49 Christophe JAILLET
2022-08-16 9:05 ` Charles Keepax
0 siblings, 1 reply; 2+ messages in thread
From: Christophe JAILLET @ 2022-08-06 15:49 UTC (permalink / raw)
To: Jaroslav Kysela, Takashi Iwai
Cc: Christophe JAILLET, alsa-devel, kernel-janitors, linux-kernel, patches
__MFD_WM8994_PDATA_H__ is already used for:
include/linux/mfd/wm8994/pdata.h
Based on file names, use __MFD_WM8904_PDATA_H__ instead here.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
Not sure of if a Fixes: tag is needed.
If yes, I would use:
9e50108668a7 ("mfd: Add initial WM8994 support")
which introduced the conflict,
even if:
a91eb199e4dc8 ("ASoC: Initial WM8904 CODEC driver")
which introduced the typo is more logical.
No strong opinion on it.
---
include/sound/wm8904.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/sound/wm8904.h b/include/sound/wm8904.h
index 88ac1870510e..f74293a83a17 100644
--- a/include/sound/wm8904.h
+++ b/include/sound/wm8904.h
@@ -7,8 +7,8 @@
* Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
*/
-#ifndef __MFD_WM8994_PDATA_H__
-#define __MFD_WM8994_PDATA_H__
+#ifndef __MFD_WM8904_PDATA_H__
+#define __MFD_WM8904_PDATA_H__
/* Used to enable configuration of a GPIO to all zeros */
#define WM8904_GPIO_NO_CONFIG 0x8000
--
2.34.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ASoC: Fix the include guard used for include/sound/wm8904.h
2022-08-06 15:49 [PATCH] ASoC: Fix the include guard used for include/sound/wm8904.h Christophe JAILLET
@ 2022-08-16 9:05 ` Charles Keepax
0 siblings, 0 replies; 2+ messages in thread
From: Charles Keepax @ 2022-08-16 9:05 UTC (permalink / raw)
To: Christophe JAILLET
Cc: alsa-devel, patches, kernel-janitors, linux-kernel, Takashi Iwai
On Sat, Aug 06, 2022 at 05:49:14PM +0200, Christophe JAILLET wrote:
> __MFD_WM8994_PDATA_H__ is already used for:
> include/linux/mfd/wm8994/pdata.h
>
> Based on file names, use __MFD_WM8904_PDATA_H__ instead here.
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Thanks,
Charles
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-16 9:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-06 15:49 [PATCH] ASoC: Fix the include guard used for include/sound/wm8904.h Christophe JAILLET
2022-08-16 9:05 ` Charles Keepax
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).