linux-kernel - [PATCH] Blackfin: bf537: use "CONFIG_SND_SOC

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 for Android: free password hash cracker in your pocket

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

Date:	Fri, 05 Apr 2013 11:20:46 +0200
From:	Paul Bolle <pebolle@...cali.nl>
To:	Mike Frysinger <vapier@...too.org>
Cc:	Jean Delvare <khali@...ux-fr.org>,
	Guenter Roeck <linux@...ck-us.net>,
	uclinux-dist-devel@...ckfin.uclinux.org,
	linux-kernel@...r.kernel.org
Subject: [PATCH] Blackfin: bf537: use "CONFIG_SND_SOC_AD193X"

Commit 57084ede395bb3c9da7905701d34a3b7d33c9356 ("blackfin: bf537:
stamp: update board file for 193x") changed two references to
CONFIG_SND_BF5XX_SOC_AD193X (and CONFIG_SND_BF5XX_SOC_AD193X_MODULE).
One was changed to CONFIG_SND_SOC_AD193X_SPI, the other to
CONFIG_SND_SOC_AD193X_I2C. The commit explanation doesn't elaborate on
the reason for these changes nor on the reason to drop module support.

Anyhow, neither of these two new Kconfig macros is valid. It was
probably intended to use CONFIG_SND_SOC_AD193X here. So let's use that.
And let's also reenable module support by using the IS_ENABLED() macro.

Signed-off-by: Paul Bolle <pebolle@...cali.nl>
---
0) Untested. Please note that I fail to see the point of commit
57084ede395bb3c9da7905701d34a3b7d33c9356, which was added in v3.4, even
if I assume it wanted to use CONFIG_SND_SOC_AD193X. Perhaps I'm missing
something obvious. Anyhow, review is appreciated.

1) Added Jean and Guenter because they seem to take in interest in
Blackfin's stamp files.

 arch/blackfin/mach-bf537/boards/stamp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index e6fdc2a..94a193e 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -975,7 +975,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 	},
 #endif
 
-#ifdef CONFIG_SND_SOC_AD193X_SPI
+#if IS_ENABLED(CONFIG_SND_SOC_AD193X)
 	{
 		.modalias = "ad193x",
 		.max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
@@ -2176,7 +2176,7 @@ static unsigned long adt7316_i2c_data[2] = {
 #endif
 
 static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
-#ifdef CONFIG_SND_SOC_AD193X_I2C
+#if IS_ENABLED(CONFIG_SND_SOC_AD193X)
 	{
 		I2C_BOARD_INFO("ad1937", 0x04),
 	},
-- 
1.7.11.7

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/