* [PATCH] ARM: davinci: use is IS_ENABLED macro
@ 2013-03-25 11:21 Prabhakar lad
2013-03-25 14:16 ` Randy Dunlap
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Prabhakar lad @ 2013-03-25 11:21 UTC (permalink / raw)
To: DLOS, LAK, Sekhar Nori; +Cc: LKML, Lad, Prabhakar
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.
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, },
--
1.7.4.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] ARM: davinci: use is IS_ENABLED macro
2013-03-25 11:21 [PATCH] ARM: davinci: use is IS_ENABLED macro Prabhakar lad
@ 2013-03-25 14:16 ` Randy Dunlap
2013-03-26 13:32 ` Prabhakar Lad
2013-03-27 10:04 ` Sekhar Nori
2013-03-27 10:43 ` Stephen Rothwell
2 siblings, 1 reply; 7+ messages in thread
From: Randy Dunlap @ 2013-03-25 14:16 UTC (permalink / raw)
To: Prabhakar lad; +Cc: DLOS, LAK, Sekhar Nori, LKML
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] ARM: davinci: use is IS_ENABLED macro
2013-03-25 14:16 ` Randy Dunlap
@ 2013-03-26 13:32 ` Prabhakar Lad
0 siblings, 0 replies; 7+ messages in thread
From: Prabhakar Lad @ 2013-03-26 13:32 UTC (permalink / raw)
To: Randy Dunlap; +Cc: DLOS, LAK, Sekhar Nori, LKML
Hi Randy,
On Mon, Mar 25, 2013 at 7:46 PM, Randy Dunlap <rdunlap@infradead.org> wrote:
> 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?
>
as mentioned in my NOTE when I built with the above
mentioned *defconfig's all the files which were modified
in this patch got built (.o files were created), which indicates
#include <linux/kconfig.h> is included :-)
Regards,
--Prabhakar
>
>> 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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] ARM: davinci: use is IS_ENABLED macro
2013-03-25 11:21 [PATCH] ARM: davinci: use is IS_ENABLED macro Prabhakar lad
2013-03-25 14:16 ` Randy Dunlap
@ 2013-03-27 10:04 ` Sekhar Nori
2013-03-27 10:43 ` Stephen Rothwell
2 siblings, 0 replies; 7+ messages in thread
From: Sekhar Nori @ 2013-03-27 10:04 UTC (permalink / raw)
To: Prabhakar lad; +Cc: DLOS, LAK, LKML
On 3/25/2013 4:51 PM, 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>
Queuing this for v3.10
Thanks,
Sekhar
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] ARM: davinci: use is IS_ENABLED macro
2013-03-25 11:21 [PATCH] ARM: davinci: use is IS_ENABLED macro Prabhakar lad
2013-03-25 14:16 ` Randy Dunlap
2013-03-27 10:04 ` Sekhar Nori
@ 2013-03-27 10:43 ` Stephen Rothwell
2013-03-28 4:37 ` Prabhakar Lad
2 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2013-03-27 10:43 UTC (permalink / raw)
To: Prabhakar lad; +Cc: DLOS, LAK, Sekhar Nori, LKML
[-- Attachment #1: Type: text/plain, Size: 617 bytes --]
Hi,
On Mon, 25 Mar 2013 16:51:35 +0530 Prabhakar lad <prabhakar.csengg@gmail.com> wrote:
>
> --- 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
Why not
#define HAS_MMC IS_ENABLED(CONFIG_MMC_DAVINCI)
and similarly in the rest?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] ARM: davinci: use is IS_ENABLED macro
2013-03-27 10:43 ` Stephen Rothwell
@ 2013-03-28 4:37 ` Prabhakar Lad
2013-04-01 6:12 ` Sekhar Nori
0 siblings, 1 reply; 7+ messages in thread
From: Prabhakar Lad @ 2013-03-28 4:37 UTC (permalink / raw)
To: Sekhar Nori; +Cc: DLOS, LAK, LKML, Stephen Rothwell
Hi Sekhar,
On Wed, Mar 27, 2013 at 4:13 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi,
>
> On Mon, 25 Mar 2013 16:51:35 +0530 Prabhakar lad <prabhakar.csengg@gmail.com> wrote:
>>
>> --- 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
>
> Why not
>
> #define HAS_MMC IS_ENABLED(CONFIG_MMC_DAVINCI)
>
> and similarly in the rest?
>
Stephen's suggestion looks good to me, if you haven’t queued it i'll post a v2,
or if you have already queued it I'll create a patch on top of the
same patch fixing it.
lemme know how would you want it.
Regards,
--Prabhakar
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] ARM: davinci: use is IS_ENABLED macro
2013-03-28 4:37 ` Prabhakar Lad
@ 2013-04-01 6:12 ` Sekhar Nori
0 siblings, 0 replies; 7+ messages in thread
From: Sekhar Nori @ 2013-04-01 6:12 UTC (permalink / raw)
To: Prabhakar Lad; +Cc: DLOS, LAK, LKML, Stephen Rothwell
On 3/28/2013 10:07 AM, Prabhakar Lad wrote:
> Hi Sekhar,
>
> On Wed, Mar 27, 2013 at 4:13 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Hi,
>>
>> On Mon, 25 Mar 2013 16:51:35 +0530 Prabhakar lad <prabhakar.csengg@gmail.com> wrote:
>>>
>>> --- 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
>>
>> Why not
>>
>> #define HAS_MMC IS_ENABLED(CONFIG_MMC_DAVINCI)
>>
>> and similarly in the rest?
>>
> Stephen's suggestion looks good to me, if you haven’t queued it i'll post a v2,
> or if you have already queued it I'll create a patch on top of the
> same patch fixing it.
> lemme know how would you want it.
Please post a v2. I will take that instead.
Thanks,
Sekhar
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-04-01 6:12 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-25 11:21 [PATCH] ARM: davinci: use is IS_ENABLED macro Prabhakar lad
2013-03-25 14:16 ` Randy Dunlap
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
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).