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, "David S. Miller" <davem@davemloft.net>,
Florian Westphal <fw@strlen.de>,
Antonio Quartulli <a@unstable.cc>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Mugunthan V N <mugunthanvnm@ti.com>
Subject: [PATCH 03/15] ethernet: amd: use IS_ENABLED() instead of checking for built-in or module
Date: Mon, 12 Sep 2016 10:03:34 -0400 [thread overview]
Message-ID: <1473689026-6983-4-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/amd/7990.c | 6 +++---
drivers/net/ethernet/amd/amd8111e.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/amd/7990.c b/drivers/net/ethernet/amd/7990.c
index dcf2a1f3643d..dc57f2759f44 100644
--- a/drivers/net/ethernet/amd/7990.c
+++ b/drivers/net/ethernet/amd/7990.c
@@ -45,14 +45,14 @@
#define WRITERDP(lp, x) out_be16(lp->base + LANCE_RDP, (x))
#define READRDP(lp) in_be16(lp->base + LANCE_RDP)
-#if defined(CONFIG_HPLANCE) || defined(CONFIG_HPLANCE_MODULE)
+#if IS_ENABLED(CONFIG_HPLANCE)
#include "hplance.h"
#undef WRITERAP
#undef WRITERDP
#undef READRDP
-#if defined(CONFIG_MVME147_NET) || defined(CONFIG_MVME147_NET_MODULE)
+#if IS_ENABLED(CONFIG_MVME147_NET)
/* Lossage Factor Nine, Mr Sulu. */
#define WRITERAP(lp, x) (lp->writerap(lp, x))
@@ -86,7 +86,7 @@ static inline __u16 READRDP(struct lance_private *lp)
}
#endif
-#endif /* CONFIG_HPLANCE || CONFIG_HPLANCE_MODULE */
+#endif /* IS_ENABLED(CONFIG_HPLANCE) */
/* debugging output macros, various flavours */
/* #define TEST_HITS */
diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
index 94960055fa1f..f92cc97151ec 100644
--- a/drivers/net/ethernet/amd/amd8111e.c
+++ b/drivers/net/ethernet/amd/amd8111e.c
@@ -89,7 +89,7 @@ Revision History:
#include <asm/byteorder.h>
#include <asm/uaccess.h>
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
+#if IS_ENABLED(CONFIG_VLAN_8021Q)
#define AMD8111E_VLAN_TAG_USED 1
#else
#define AMD8111E_VLAN_TAG_USED 0
--
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 ` [PATCH 01/15] 3c59x: " Javier Martinez Canillas
2016-09-12 14:03 ` [PATCH 02/15] starfire: " Javier Martinez Canillas
2016-09-12 14:03 ` Javier Martinez Canillas [this message]
2016-09-12 14:11 ` [PATCH 03/15] ethernet: amd: " 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-4-git-send-email-javier@osg.samsung.com \
--to=javier@osg.samsung.com \
--cc=a@unstable.cc \
--cc=davem@davemloft.net \
--cc=fw@strlen.de \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mugunthanvnm@ti.com \
--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®