mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Alexander Shiyan <shc_work@mail.ru>
To: barebox@lists.infradead.org
Subject: [PATCH 4/7] ARM: pcm970: Replace #ifdef with IS_ENABLED()
Date: Sun, 24 Feb 2013 13:23:56 +0400	[thread overview]
Message-ID: <1361697839-14310-4-git-send-email-shc_work@mail.ru> (raw)
In-Reply-To: <1361697839-14310-1-git-send-email-shc_work@mail.ru>


Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/boards/pcm038/pcm970.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boards/pcm038/pcm970.c b/arch/arm/boards/pcm038/pcm970.c
index dd95f52..b176d8d 100644
--- a/arch/arm/boards/pcm038/pcm970.c
+++ b/arch/arm/boards/pcm038/pcm970.c
@@ -27,7 +27,6 @@
 #define GPIO_IDE_PCOE	(GPIO_PORTF + 7)
 #define GPIO_IDE_RESET	(GPIO_PORTF + 10)
 
-#ifdef CONFIG_DISK_INTF_PLATFORM_IDE
 static struct resource pcm970_ide_resources[] = {
 	{
 		.start	= MX27_PCMCIA_MEM_BASE_ADDR,
@@ -125,7 +124,6 @@ static void pcm970_ide_init(void)
 
 	platform_device_register(&pcm970_ide_device);
 }
-#endif
 
 static void pcm970_mmc_init(void)
 {
@@ -185,9 +183,8 @@ static int pcm970_init(void)
 		imx27_add_usbh2(&pcm970_usbh2_pdata);
 	}
 
-#ifdef CONFIG_DISK_INTF_PLATFORM_IDE
-	pcm970_ide_init();
-#endif
+	if (IS_ENABLED(CONFIG_DISK_INTF_PLATFORM_IDE))
+		pcm970_ide_init();
 
 	if (IS_ENABLED(CONFIG_MCI_IMX))
 		pcm970_mmc_init();
-- 
1.7.12.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2013-02-24  9:24 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-24  9:23 [PATCH 1/7] ARM: pcm038: Select IIM by default Alexander Shiyan
2013-02-24  9:23 ` [PATCH 2/7] ARM: pcm038: Fix serial number IIM-address Alexander Shiyan
2013-02-24  9:23 ` [PATCH 3/7] ARM: pcm970: Fix bug with CompactFlash Alexander Shiyan
2013-02-24  9:23 ` Alexander Shiyan [this message]
2013-02-24  9:23 ` [PATCH 5/7] ARM: i.MX27: Use DEVICE_ID_SINGLE for IIM, CCM and ESDCTL Alexander Shiyan
2013-02-24  9:23 ` [PATCH 6/7] ARM: pcm038: Using "get_ram_size" for determine SRAM size Alexander Shiyan
2013-02-24  9:23 ` [PATCH 7/7] ARM: pcm038: Update defconfig Alexander Shiyan
2013-02-24 12:32   ` Jean-Christophe PLAGNIOL-VILLARD
2013-02-25  7:58 ` [PATCH 1/7] ARM: pcm038: Select IIM by default Sascha Hauer

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=1361697839-14310-4-git-send-email-shc_work@mail.ru \
    --to=shc_work@mail.ru \
    --cc=barebox@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