From: Javier Martinez Canillas <javier@osg.samsung.com>
To: linux-kernel@vger.kernel.org
Cc: Javier Martinez Canillas <javier@osg.samsung.com>,
netdev@vger.kernel.org,
Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
Subject: [PATCH 01/15] 3c59x: use IS_ENABLED() instead of checking for built-in or module
Date: Mon, 12 Sep 2016 10:03:32 -0400 [thread overview]
Message-ID: <1473689026-6983-2-git-send-email-javier@osg.samsung.com> (raw)
In-Reply-To: <1473689026-6983-1-git-send-email-javier@osg.samsung.com>
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>
---
drivers/net/ethernet/3com/3c59x.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
index 25c55ab05c7d..9133e7926da5 100644
--- a/drivers/net/ethernet/3com/3c59x.c
+++ b/drivers/net/ethernet/3com/3c59x.c
@@ -3089,7 +3089,7 @@ static void set_rx_mode(struct net_device *dev)
iowrite16(new_mode, ioaddr + EL3_CMD);
}
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
+#if IS_ENABLED(CONFIG_VLAN_8021Q)
/* Setup the card so that it can receive frames with an 802.1q VLAN tag.
Note that this must be done after each RxReset due to some backwards
compatibility logic in the Cyclone and Tornado ASICs */
--
2.7.4
next prev parent reply other threads:[~2016-09-12 14:04 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-12 14:03 [PATCH 00/15] drivers: net: " Javier Martinez Canillas
2016-09-12 14:03 ` Javier Martinez Canillas [this message]
2016-09-12 14:03 ` [PATCH 02/15] starfire: " Javier Martinez Canillas
2016-09-12 14:03 ` [PATCH 03/15] ethernet: amd: " Javier Martinez Canillas
2016-09-12 14:11 ` Geert Uytterhoeven
2016-09-12 14:03 ` [PATCH 04/15] bnx2: " Javier Martinez Canillas
2016-09-12 14:03 ` [PATCH 05/15] sundance: " Javier Martinez Canillas
2016-09-12 14:03 ` [PATCH 06/15] net/fsl_pq_mdio: " Javier Martinez Canillas
2016-09-12 14:03 ` [PATCH 07/15] i825xx: " Javier Martinez Canillas
2016-09-12 14:03 ` [PATCH 08/15] ixgbe: " Javier Martinez Canillas
2016-09-12 15:36 ` Greg
2016-09-12 14:03 ` [PATCH 09/15] net: mvneta: " Javier Martinez Canillas
2016-09-12 14:06 ` Gregory CLEMENT
2016-09-12 14:03 ` [PATCH 10/15] natsemi: " Javier Martinez Canillas
2016-09-12 14:03 ` [PATCH 11/15] sfc: " Javier Martinez Canillas
2016-09-12 14:31 ` Bert Kenward
2016-09-12 14:03 ` [PATCH 12/15] sis900: " Javier Martinez Canillas
2016-09-12 17:10 ` Daniele Venzano
2016-09-12 14:03 ` [PATCH 13/15] stmmac: " Javier Martinez Canillas
2016-09-12 16:47 ` Alexandre Torgue
2016-09-12 14:03 ` [PATCH 14/15] hamradio: " Javier Martinez Canillas
2016-09-12 14:03 ` [PATCH 15/15] iwlegacy: " Javier Martinez Canillas
2016-09-13 3:28 ` [PATCH 00/15] drivers: net: " David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1473689026-6983-2-git-send-email-javier@osg.samsung.com \
--to=javier@osg.samsung.com \
--cc=klassert@mathematik.tu-chemnitz.de \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®