linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: broonie@opensource.wolfsonmicro.com (Mark Brown)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 5/5] ARM: SMDK6410: Fix modular build of AC97 audio driver
Date: Fri, 12 Feb 2010 10:38:53 +0000	[thread overview]
Message-ID: <1265971133-17610-5-git-send-email-broonie@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1265971133-17610-1-git-send-email-broonie@opensource.wolfsonmicro.com>

When the AC97 audio driver is built modular a _MODULE is appended to
the symbol defined for the config option. Rather than write a lengthy
check against multiple symbols just unconditionally register the AC97
controller device - much simpler and hardly a massive resource hit.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 arch/arm/mach-s3c6410/mach-smdk6410.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-s3c6410/mach-smdk6410.c b/arch/arm/mach-s3c6410/mach-smdk6410.c
index 259ebbb..f2c70ec 100644
--- a/arch/arm/mach-s3c6410/mach-smdk6410.c
+++ b/arch/arm/mach-s3c6410/mach-smdk6410.c
@@ -254,9 +254,7 @@ static struct platform_device *smdk6410_devices[] __initdata = {
 	&smdk6410_b_pwr_5v,
 #endif
 	&smdk6410_lcd_powerdev,
-#ifdef CONFIG_SND_SOC_SMDK_WM9713
 	&s3c64xx_device_ac97,
-#endif
 	&smdk6410_smsc911x,
 };
 
@@ -478,9 +476,7 @@ static void __init smdk6410_machine_init(void)
 	i2c_register_board_info(0, i2c_devs0, ARRAY_SIZE(i2c_devs0));
 	i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1));
 
-#ifdef CONFIG_SND_SOC_SMDK_WM9713
 	s3c64xx_ac97_setup_gpio(S3C64XX_AC97_GPD);
-#endif
 
 	platform_add_devices(smdk6410_devices, ARRAY_SIZE(smdk6410_devices));
 }
-- 
1.6.6.1

      parent reply	other threads:[~2010-02-12 10:38 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-12 10:38 [PATCH 1/5] ARM: SMDK64XX: Enable AC97 device Mark Brown
2010-02-12 10:38 ` [PATCH 2/5] ARM: SMDK2443: " Mark Brown
2010-02-12 10:38 ` [PATCH 3/5] ARM: S3C64XX: Add AC97 platform resources Mark Brown
2010-02-12 10:38 ` [PATCH 4/5] ARM: S3C2443: GPIO: Correct AC97 pin defines Mark Brown
2010-02-12 10:38 ` Mark Brown [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1265971133-17610-5-git-send-email-broonie@opensource.wolfsonmicro.com \
    --to=broonie@opensource.wolfsonmicro.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).