diff options
author | Javier Martinez Canillas <javier@osg.samsung.com> | 2016-08-29 06:12:04 -0400 |
---|---|---|
committer | Shawn Guo <shawnguo@kernel.org> | 2016-08-29 10:27:37 -0400 |
commit | d37bac434cb815303e48f1357c76fa020e64c649 (patch) | |
tree | fba723a59907852b45d4a1e8c58e777dca93d5a2 /arch/arm/mach-imx | |
parent | b19aa5a70e7d78d225d4f89e792019f237b3656e (diff) |
ARM: imx: use IS_ENABLED() instead of checking for built-in or module
The IS_ENABLED() macro checks if a Kconfig symbol has been enabled either
built-in or as a module, use that macro instead of open coding the same.
Using the macro makes the code more readable by helping abstract away some
of the Kconfig built-in and module enable details.
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r-- | arch/arm/mach-imx/mach-kzm_arm11_01.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/mach-kzm_arm11_01.c b/arch/arm/mach-imx/mach-kzm_arm11_01.c index 31df4361996f..e277d9c230e5 100644 --- a/arch/arm/mach-imx/mach-kzm_arm11_01.c +++ b/arch/arm/mach-imx/mach-kzm_arm11_01.c | |||
@@ -63,7 +63,7 @@ | |||
63 | */ | 63 | */ |
64 | #define KZM_ARM11_16550 (MX31_CS4_BASE_ADDR + 0x1050) | 64 | #define KZM_ARM11_16550 (MX31_CS4_BASE_ADDR + 0x1050) |
65 | 65 | ||
66 | #if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE) | 66 | #if IS_ENABLED(CONFIG_SERIAL_8250) |
67 | /* | 67 | /* |
68 | * KZM-ARM11-01 has an external UART on FPGA | 68 | * KZM-ARM11-01 has an external UART on FPGA |
69 | */ | 69 | */ |
@@ -141,7 +141,7 @@ static inline int kzm_init_ext_uart(void) | |||
141 | /* | 141 | /* |
142 | * SMSC LAN9118 | 142 | * SMSC LAN9118 |
143 | */ | 143 | */ |
144 | #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) | 144 | #if IS_ENABLED(CONFIG_SMSC911X) |
145 | static struct smsc911x_platform_config kzm_smsc9118_config = { | 145 | static struct smsc911x_platform_config kzm_smsc9118_config = { |
146 | .phy_interface = PHY_INTERFACE_MODE_MII, | 146 | .phy_interface = PHY_INTERFACE_MODE_MII, |
147 | .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH, | 147 | .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH, |
@@ -201,7 +201,7 @@ static inline int kzm_init_smsc9118(void) | |||
201 | } | 201 | } |
202 | #endif | 202 | #endif |
203 | 203 | ||
204 | #if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE) | 204 | #if IS_ENABLED(CONFIG_SERIAL_IMX) |
205 | static const struct imxuart_platform_data uart_pdata __initconst = { | 205 | static const struct imxuart_platform_data uart_pdata __initconst = { |
206 | .flags = IMXUART_HAVE_RTSCTS, | 206 | .flags = IMXUART_HAVE_RTSCTS, |
207 | }; | 207 | }; |