Skip to contentSkip to conversation

ASoC: Ux500: remove test for undefined Kconfig macro

PATCH Applied Paul Bolle 2 participants 2 messages Mar 29, 2013 – Apr 8, 2013

Subsystems (2)
lore
Share & tools
lore

Paul Bolle

author
#0 lore raw

PATCH 1/1 ASoC: Ux500: remove test for undefined Kconfig macro

A test for CONFIG_SND_SOC_UX500_AB5500 was added in v3.5. But there never was a corresponding Kconfig symbol so this test has always evaluated to true. And since AB5500 support was removed in v3.5 it appears safe to remove this test and a few lines of code.

---
Untested.

 sound/soc/ux500/ux500_msp_dai.h | 5 -----
 1 file changed, 5 deletions(-)
sound/soc/ux500/ux500_msp_dai.h +0 -5
index 9c778d9..f531043 100644
@@ -35,13 +35,8 @@
 #define FRAME_PER_8_SLOTS				138
 #define FRAME_PER_16_SLOTS				277
 
-#ifndef CONFIG_SND_SOC_UX500_AB5500
 #define UX500_MSP_INTERNAL_CLOCK_FREQ  40000000
 #define UX500_MSP1_INTERNAL_CLOCK_FREQ UX500_MSP_INTERNAL_CLOCK_FREQ
-#else
-#define UX500_MSP_INTERNAL_CLOCK_FREQ 13000000
-#define UX500_MSP1_INTERNAL_CLOCK_FREQ (UX500_MSP_INTERNAL_CLOCK_FREQ * 2)
-#endif
 
 #define UX500_MSP_MIN_CHANNELS		1
 #define UX500_MSP_MAX_CHANNELS		8
Signature · 1 line
1.7.11.7
Applied
#1 lore raw
Quoted 4 lines · Paul Bolle

A test for CONFIG_SND_SOC_UX500_AB5500 was added in v3.5. But there never was a corresponding Kconfig symbol so this test has always evaluated to true. And since AB5500 support was removed in v3.5 it appears safe to remove this test and a few lines of code.

Applied, thanks.