Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0a56db9 authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by Sekhar Nori
Browse files

ARM: davinci: use is IS_ENABLED macro 



This patches replaces #if defined() by IS_ENABLED macro, which provides
better readability.

Signed-off-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent ab70db5b

arch/arm/mach-davinci/board-da830-evm.c

+1 −5
Original line number Diff line number Diff line
@@ -298,11 +298,7 @@ static const short da830_evm_emif25_pins[] = { 
	-1

};



#if defined(CONFIG_MMC_DAVINCI) || defined(CONFIG_MMC_DAVINCI_MODULE)

#define HAS_MMC	1

#else

#define HAS_MMC	0

#endif

#define HAS_MMC		IS_ENABLED(CONFIG_MMC_DAVINCI)



#ifdef CONFIG_DA830_UI_NAND

static struct mtd_partition da830_evm_nand_partitions[] = {

arch/arm/mach-davinci/board-da850-evm.c

+1 −6
Original line number Diff line number Diff line
@@ -335,12 +335,7 @@ static const short da850_evm_nor_pins[] = { 
	-1

};



#if defined(CONFIG_MMC_DAVINCI) || \

    defined(CONFIG_MMC_DAVINCI_MODULE)

#define HAS_MMC 1

#else

#define HAS_MMC 0

#endif

#define HAS_MMC		IS_ENABLED(CONFIG_MMC_DAVINCI)



static inline void da850_evm_setup_nor_nand(void)

{

arch/arm/mach-davinci/board-dm644x-evm.c

+5 −20
Original line number Diff line number Diff line
@@ -750,26 +750,11 @@ 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)

#define HAS_ATA 1

#else

#define HAS_ATA 0

#endif



#if defined(CONFIG_MTD_PHYSMAP) || \

    defined(CONFIG_MTD_PHYSMAP_MODULE)

#define HAS_NOR 1

#else

#define HAS_NOR 0

#endif



#if defined(CONFIG_MTD_NAND_DAVINCI) || \

    defined(CONFIG_MTD_NAND_DAVINCI_MODULE)

#define HAS_NAND 1

#else

#define HAS_NAND 0

#endif

#define HAS_ATA		IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710)



#define HAS_NOR		IS_ENABLED(CONFIG_MTD_PHYSMAP)



#define HAS_NAND	IS_ENABLED(CONFIG_MTD_NAND_DAVINCI)



static __init void davinci_evm_init(void)

{

arch/arm/mach-davinci/board-dm646x-evm.c

+1 −6
Original line number Diff line number Diff line
@@ -117,12 +117,7 @@ static struct platform_device davinci_nand_device = { 
	},

};



#if defined(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \

    defined(CONFIG_BLK_DEV_PALMCHIP_BK3710_MODULE)

#define HAS_ATA 1

#else

#define HAS_ATA 0

#endif

#define HAS_ATA		IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710)



/* CPLD Register 0 bits to control ATA */

#define DM646X_EVM_ATA_RST		BIT(0)

arch/arm/mach-davinci/board-neuros-osd2.c

+2 −13
Original line number Diff line number Diff line
@@ -167,20 +167,9 @@ static struct davinci_mmc_config davinci_ntosd2_mmc_config = { 
	.version	= MMC_CTLR_VERSION_1

};



#define HAS_ATA		IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710)



#if defined(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \

	defined(CONFIG_BLK_DEV_PALMCHIP_BK3710_MODULE)

#define HAS_ATA 1

#else

#define HAS_ATA 0

#endif



#if defined(CONFIG_MTD_NAND_DAVINCI) || \

	defined(CONFIG_MTD_NAND_DAVINCI_MODULE)

#define HAS_NAND 1

#else

#define HAS_NAND 0

#endif

#define HAS_NAND	IS_ENABLED(CONFIG_MTD_NAND_DAVINCI)



static __init void davinci_ntosd2_init(void)

{