From: rdunlap@infradead.org (Randy Dunlap)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: davinci: use is IS_ENABLED macro
Date: Mon, 25 Mar 2013 07:16:57 -0700 [thread overview]
Message-ID: <51505C59.1040607@infradead.org> (raw)
In-Reply-To: <1364210495-7938-1-git-send-email-prabhakar.csengg@gmail.com>
On 03/25/13 04:21, Prabhakar lad wrote:
> From: Lad, Prabhakar <prabhakar.csengg@gmail.com>
>
> This patches replaces #if defined() by IS_ENABLED macro, which provides
> better readability.
>
> Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
> Cc: Sekhar Nori <nsekhar@ti.com>
> ---
> Note: This patch is compile tested only for davinci_all_defconfig
> and da8xx_omapl_defconfig.
Source files that use IS_ENABLED() etc. should also
#include <linux/kconfig.h>
Is that already done in all of these source files?
> 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, },
>
--
~Randy
next prev parent reply other threads:[~2013-03-25 14:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-25 11:21 [PATCH] ARM: davinci: use is IS_ENABLED macro Prabhakar lad
2013-03-25 14:16 ` Randy Dunlap [this message]
2013-03-26 13:32 ` Prabhakar Lad
2013-03-27 10:04 ` Sekhar Nori
2013-03-27 10:43 ` Stephen Rothwell
2013-03-28 4:37 ` Prabhakar Lad
2013-04-01 6:12 ` Sekhar Nori
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=51505C59.1040607@infradead.org \
--to=rdunlap@infradead.org \
--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).