[PATCH 00/15] drivers: net: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
[PATCH 01/15] 3c59x: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
[PATCH 03/15] ethernet: amd: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
Re: [PATCH 03/15] ethernet: amd: use IS_ENABLED() instead of checking for built-in or module · Geert Uytterhoeven <geert@linux-m68k.org> · 2016-09-12
[PATCH 05/15] sundance: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
[PATCH 06/15] net/fsl_pq_mdio: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
[PATCH 07/15] i825xx: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
[PATCH 08/15] ixgbe: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
Re: [PATCH 08/15] ixgbe: use IS_ENABLED() instead of checking for built-in or module · Greg <hidden> · 2016-09-12
[PATCH 09/15] net: mvneta: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
[PATCH 10/15] natsemi: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
[PATCH 11/15] sfc: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
Re: [PATCH 11/15] sfc: use IS_ENABLED() instead of checking for built-in or module · Bert Kenward <hidden> · 2016-09-12
[PATCH 13/15] stmmac: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
Re: [PATCH 13/15] stmmac: use IS_ENABLED() instead of checking for built-in or module · Alexandre Torgue <hidden> · 2016-09-12
[PATCH 15/15] iwlegacy: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
[PATCH 14/15] hamradio: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
[PATCH 12/15] sis900: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
Re: [PATCH 12/15] sis900: use IS_ENABLED() instead of checking for built-in or module · Daniele Venzano <venza@brownhat.org> · 2016-09-12
[PATCH 04/15] bnx2: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
[PATCH 02/15] starfire: use IS_ENABLED() instead of checking for built-in or module · Javier Martinez Canillas <hidden> · 2016-09-12
Re: [PATCH 00/15] drivers: net: use IS_ENABLED() instead of checking for built-in or module · David Miller <davem@davemloft.net> · 2016-09-13

[PATCH 04/15] bnx2: use IS_ENABLED() instead of checking for built-in or module

STALE3687d

From: Javier Martinez Canillas <hidden>
Date: 2016-09-12 14:08:57
Also in: lkml
Subsystem: broadcom bnx2 gigabit ethernet driver, networking drivers, the rest · Maintainers: Rasesh Mody, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds

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 <redacted>
---

 drivers/net/ethernet/broadcom/bnx2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 8fc3f3c137f8..ecd357dbb1d4 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c

@@ -50,7 +50,7 @@
 #include <linux/log2.h>
 #include <linux/aer.h>
 
-#if defined(CONFIG_CNIC) || defined(CONFIG_CNIC_MODULE)
+#if IS_ENABLED(CONFIG_CNIC)
 #define BCM_CNIC 1
 #include "cnic_if.h"
 #endif

-- 
2.7.4

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help