linux-kernel - [PATCH] ASoC: Fix the include guard used for include/sound/wm8904.h

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <eff524b78d1f851e3dc42999e68c286492f92b21.1659800938.git.christophe.jaillet@wanadoo.fr>
Date:   Sat,  6 Aug 2022 17:49:14 +0200
From:   Christophe JAILLET <christophe.jaillet@...adoo.fr>
To:     Jaroslav Kysela <perex@...ex.cz>, Takashi Iwai <tiwai@...e.com>
Cc:     linux-kernel@...r.kernel.org, kernel-janitors@...r.kernel.org,
        Christophe JAILLET <christophe.jaillet@...adoo.fr>,
        patches@...nsource.cirrus.com, alsa-devel@...a-project.org
Subject: [PATCH] ASoC: Fix the include guard used for include/sound/wm8904.h

__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@...adoo.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@...nsource.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