iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ethernet: amd: use IS_ENABLED() instead of checking for built-in or module

Browse Source 
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>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Javier Martinez Canillas 2016-09-12 10:03:34 -04:00 committed by David S. Miller
parent 5a5ab1611a
commit 941992d294
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/amd/7990.c
View File

@ -45,14 +45,14 @@
#define WRITERDP(lp, x) out_be16(lp->base + LANCE_RDP, (x)) #define WRITERDP(lp, x) out_be16(lp->base + LANCE_RDP, (x))
#define READRDP(lp) in_be16(lp->base + LANCE_RDP) #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" #include "hplance.h"
#undef WRITERAP #undef WRITERAP
#undef WRITERDP #undef WRITERDP
#undef READRDP #undef READRDP
#if defined(CONFIG_MVME147_NET) || defined(CONFIG_MVME147_NET_MODULE) #if IS_ENABLED(CONFIG_MVME147_NET)
/* Lossage Factor Nine, Mr Sulu. */ /* Lossage Factor Nine, Mr Sulu. */
#define WRITERAP(lp, x) (lp->writerap(lp, x)) #define WRITERAP(lp, x) (lp->writerap(lp, x))
@ -86,7 +86,7 @@ static inline __u16 READRDP(struct lance_private *lp)
} }
#endif #endif
#endif /* CONFIG_HPLANCE || CONFIG_HPLANCE_MODULE */ #endif /* IS_ENABLED(CONFIG_HPLANCE) */
/* debugging output macros, various flavours */ /* debugging output macros, various flavours */
/* #define TEST_HITS */ /* #define TEST_HITS */

2
drivers/net/ethernet/amd/amd8111e.c
View File

@ -89,7 +89,7 @@ Revision History:
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <asm/uaccess.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 #define AMD8111E_VLAN_TAG_USED 1
#else #else
#define AMD8111E_VLAN_TAG_USED 0 #define AMD8111E_VLAN_TAG_USED 0