From patchwork Mon Mar 25 11:21:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 2330551 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by patchwork2.kernel.org (Postfix) with ESMTP id 3C079DF24C for ; Mon, 25 Mar 2013 11:25:58 +0000 (UTC) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id r2PBLmSX009754; Mon, 25 Mar 2013 06:21:49 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r2PBLmGa026515; Mon, 25 Mar 2013 06:21:48 -0500 Received: from dlelxv24.itg.ti.com (172.17.1.199) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.2.342.3; Mon, 25 Mar 2013 06:21:48 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id r2PBLmrA003565; Mon, 25 Mar 2013 06:21:48 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 5F39780627; Mon, 25 Mar 2013 05:21:48 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp52.itg.ti.com (dflp52.itg.ti.com [128.247.22.96]) by linux.omap.com (Postfix) with ESMTP id 5A98480626 for ; Mon, 25 Mar 2013 05:21:46 -0600 (CST) Received: from neches.ext.ti.com (neches.ext.ti.com [192.91.81.29]) by dflp52.itg.ti.com (8.13.7/8.13.8) with ESMTP id r2PBLk7f001283 for ; Mon, 25 Mar 2013 06:21:46 -0500 (CDT) Received: from mail6.bemta7.messagelabs.com (mail6.bemta7.messagelabs.com [216.82.255.55]) by neches.ext.ti.com (8.13.7/8.13.7) with ESMTP id r2PBLjKO012328 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 25 Mar 2013 06:21:46 -0500 Received: from [216.82.253.147:15344] by server-13.bemta-7.messagelabs.com id 86/06-22723-94330515; Mon, 25 Mar 2013 11:21:45 +0000 X-Env-Sender: prabhakar.csengg@gmail.com X-Msg-Ref: server-3.tower-165.messagelabs.com!1364210504!11062212!1 X-Originating-IP: [209.85.160.53] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, UPPERCASE_25_50,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22924 invoked from network); 25 Mar 2013 11:21:45 -0000 Received: from mail-pb0-f53.google.com (HELO mail-pb0-f53.google.com) (209.85.160.53) by server-3.tower-165.messagelabs.com with RC4-SHA encrypted SMTP; 25 Mar 2013 11:21:45 -0000 Received: by mail-pb0-f53.google.com with SMTP id un1so4087597pbc.40 for ; Mon, 25 Mar 2013 04:21:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=jATH8+w87fiOkeCP6WLbAXcUH80rTBu8fnFkpf4wgbY=; b=j+cB6PsxqeUJlgYMFk5GRAuARYoM24pMs+4BRWnDCjZbUHFv1y2DsjwSe4inyIzWpF LnWUFZTdCnJ9Vs9kZdiWQzm61e5favrEWVaSUkZGq4BDMhHh7ecfo4828hOwGAdM1QgQ rdv/JPh7HPLW/FN2fUfIioZ+dG0FbjNaJpNuvs0BR8RfUAgyyAf+fjS0T503l1P2CChB WepcKFnKF2BOcK9FFCKx+4kY33m53ehLzq1ndRHaXv9xt7hdQAeLGTrttxKZ2LnWMOVB nAuodaFlQ4e/SBIOn0TxbGP1FoZ+PfxYApODMO92AQz5RhvGUlUqxJBLaPqvmwBvwlDQ Pdow== X-Received: by 10.66.179.238 with SMTP id dj14mr17672170pac.68.1364210504359; Mon, 25 Mar 2013 04:21:44 -0700 (PDT) Received: from localhost.localdomain ([59.98.241.205]) by mx.google.com with ESMTPS id kt5sm13114791pbc.30.2013.03.25.04.21.40 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 25 Mar 2013 04:21:43 -0700 (PDT) From: Prabhakar lad To: DLOS , LAK , Sekhar Nori Subject: [PATCH] ARM: davinci: use is IS_ENABLED macro Date: Mon, 25 Mar 2013 16:51:35 +0530 Message-ID: <1364210495-7938-1-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.7.4.1 CC: LKML X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com From: Lad, Prabhakar This patches replaces #if defined() by IS_ENABLED macro, which provides better readability. Signed-off-by: Lad, Prabhakar Cc: Sekhar Nori --- Note: This patch is compile tested only for davinci_all_defconfig and da8xx_omapl_defconfig. arch/arm/mach-davinci/board-da830-evm.c | 2 +- arch/arm/mach-davinci/board-da850-evm.c | 3 +-- arch/arm/mach-davinci/board-dm644x-evm.c | 9 +++------ arch/arm/mach-davinci/board-dm646x-evm.c | 3 +-- arch/arm/mach-davinci/board-neuros-osd2.c | 6 ++---- arch/arm/mach-davinci/devices.c | 2 +- arch/arm/mach-davinci/usb.c | 2 +- 7 files changed, 10 insertions(+), 17 deletions(-) diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index 6da25ee..68ade71 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c @@ -298,7 +298,7 @@ static const short da830_evm_emif25_pins[] = { -1 }; -#if defined(CONFIG_MMC_DAVINCI) || defined(CONFIG_MMC_DAVINCI_MODULE) +#if IS_ENABLED(CONFIG_MMC_DAVINCI) #define HAS_MMC 1 #else #define HAS_MMC 0 diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index c2dfe06..3475769 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -335,8 +335,7 @@ static const short da850_evm_nor_pins[] = { -1 }; -#if defined(CONFIG_MMC_DAVINCI) || \ - defined(CONFIG_MMC_DAVINCI_MODULE) +#if IS_ENABLED(CONFIG_MMC_DAVINCI) #define HAS_MMC 1 #else #define HAS_MMC 0 diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index 71735e7..d0f6365 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c @@ -750,22 +750,19 @@ static int davinci_phy_fixup(struct phy_device *phydev) return 0; } -#if defined(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \ - defined(CONFIG_BLK_DEV_PALMCHIP_BK3710_MODULE) +#if IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710) #define HAS_ATA 1 #else #define HAS_ATA 0 #endif -#if defined(CONFIG_MTD_PHYSMAP) || \ - defined(CONFIG_MTD_PHYSMAP_MODULE) +#if IS_ENABLED(CONFIG_MTD_PHYSMAP) #define HAS_NOR 1 #else #define HAS_NOR 0 #endif -#if defined(CONFIG_MTD_NAND_DAVINCI) || \ - defined(CONFIG_MTD_NAND_DAVINCI_MODULE) +#if IS_ENABLED(CONFIG_MTD_NAND_DAVINCI) #define HAS_NAND 1 #else #define HAS_NAND 0 diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index de7adff..c84fdd5 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c @@ -117,8 +117,7 @@ static struct platform_device davinci_nand_device = { }, }; -#if defined(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \ - defined(CONFIG_BLK_DEV_PALMCHIP_BK3710_MODULE) +#if IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710) #define HAS_ATA 1 #else #define HAS_ATA 0 diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c index 1c98107..8bd0a43 100644 --- a/arch/arm/mach-davinci/board-neuros-osd2.c +++ b/arch/arm/mach-davinci/board-neuros-osd2.c @@ -168,15 +168,13 @@ static struct davinci_mmc_config davinci_ntosd2_mmc_config = { }; -#if defined(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \ - defined(CONFIG_BLK_DEV_PALMCHIP_BK3710_MODULE) +#if IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710) #define HAS_ATA 1 #else #define HAS_ATA 0 #endif -#if defined(CONFIG_MTD_NAND_DAVINCI) || \ - defined(CONFIG_MTD_NAND_DAVINCI_MODULE) +#if IS_ENABLED(CONFIG_MTD_NAND_DAVINCI) #define HAS_NAND 1 #else #define HAS_NAND 0 diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c index 4c48a36..df135de 100644 --- a/arch/arm/mach-davinci/devices.c +++ b/arch/arm/mach-davinci/devices.c @@ -119,7 +119,7 @@ void __init davinci_init_ide(void) platform_device_register(&ide_device); } -#if defined(CONFIG_MMC_DAVINCI) || defined(CONFIG_MMC_DAVINCI_MODULE) +#if IS_ENABLED(CONFIG_MMC_DAVINCI) static u64 mmcsd0_dma_mask = DMA_BIT_MASK(32); diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c index 34509ff..5764d65 100644 --- a/arch/arm/mach-davinci/usb.c +++ b/arch/arm/mach-davinci/usb.c @@ -17,7 +17,7 @@ #define DA8XX_USB0_BASE 0x01e00000 #define DA8XX_USB1_BASE 0x01e25000 -#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE) +#if IS_ENABLED(CONFIG_USB_MUSB_HDRC) static struct musb_hdrc_eps_bits musb_eps[] = { { "ep1_tx", 8, }, { "ep1_rx", 8, },