[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 12/15] sis900: use IS_ENABLED() instead of checking for built-in or module

STALE3686d

From: Javier Martinez Canillas <hidden>
Date: 2016-09-12 14:06:31
Also in: lkml
Subsystem: networking drivers, sis 900/7016 fast ethernet driver, the rest · Maintainers: Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Daniele Venzano, 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/sis/sis900.c | 4 ++--
 drivers/net/ethernet/sis/sis900.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index 95001ee408ab..6f85276376e8 100644
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c

@@ -1426,7 +1426,7 @@ static void sis900_set_mode(struct sis900_private *sp, int speed, int duplex)
 		rx_flags |= RxATX;
 	}
 
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
+#if IS_ENABLED(CONFIG_VLAN_8021Q)
 	/* Can accept Jumbo packet */
 	rx_flags |= RxAJAB;
 #endif

@@ -1750,7 +1750,7 @@ static int sis900_rx(struct net_device *net_dev)
 		data_size = rx_status & DSIZE;
 		rx_size = data_size - CRC_SIZE;
 
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
+#if IS_ENABLED(CONFIG_VLAN_8021Q)
 		/* ``TOOLONG'' flag means jumbo packet received. */
 		if ((rx_status & TOOLONG) && data_size <= MAX_FRAME_SIZE)
 			rx_status &= (~ ((unsigned int)TOOLONG));

diff --git a/drivers/net/ethernet/sis/sis900.h b/drivers/net/ethernet/sis/sis900.h
index 7d430d322931..f0da3dc52c01 100644
--- a/drivers/net/ethernet/sis/sis900.h
+++ b/drivers/net/ethernet/sis/sis900.h

@@ -310,7 +310,7 @@ enum sis630_revision_id {
 #define CRC_SIZE                4
 #define MAC_HEADER_SIZE         14
 
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
+#if IS_ENABLED(CONFIG_VLAN_8021Q)
 #define MAX_FRAME_SIZE  (1518 + 4)
 #else
 #define MAX_FRAME_SIZE  1518

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