ARM: S3C24XX: check for 'CONFIG_SND_SOC_SAMSUNG_SMDK2443_WM9710'
Subsystems (3)
PATCH 1/1 ARM: S3C24XX: check for 'CONFIG_SND_SOC_SAMSUNG_SMDK2443_WM9710'
Since v2.6.34 there are two checks for CONFIG_SND_SOC_SMDK2443_WM9710. But a Kconfig symbol SND_SOC_SMDK2443_WM9710 has never been part of the tree. However, in v2.6.38 a symbol SND_SOC_SAMSUNG_SMDK2443_WM9710 was added, so it seems these checks should be for its macro.
But the second check is a guard for
s3c24xx_ac97_setup_gpio(S3C24XX_AC97_GPE0);
And since neither s3c24xx_ac97_setup_gpio nor S3C24XX_AC97_GPE0 are defined anywhere, that second check can be dropped entirely.
Signed-off-by Paul Bolle <[email protected]>
---
Tested with git grep. Needs further testing, obviously.
arch/arm/mach-s3c24xx/mach-smdk2443.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
arch/arm/mach-s3c24xx/mach-smdk2443.c +1 -5
@@ -112,7 +112,7 @@ static struct platform_device *smdk2443_devices[] __initdata = { &s3c_device_wdt, &s3c_device_i2c0, &s3c_device_hsmmc1, -#ifdef CONFIG_SND_SOC_SMDK2443_WM9710 +#ifdef CONFIG_SND_SOC_SAMSUNG_SMDK2443_WM9710 &s3c_device_ac97, #endif &s3c2443_device_dma,
@@ -130,10 +130,6 @@ static void __init smdk2443_machine_init(void) {s3c_i2c0_set_platdata (NULL ); -#ifdef CONFIG_SND_SOC_SMDK2443_WM9710 -s3c24xx_ac97_setup_gpio (S3C24XX_AC97_GPE0 ); -#endif -platform_add_devices (smdk2443_devices,ARRAY_SIZE (smdk2443_devices));smdk_machine_init (); }
Signature · 1 line
1.9.0