Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 941992d2 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by David S. Miller
Browse files

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



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: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5a5ab161

drivers/net/ethernet/amd/7990.c

+3 −3
Original line number Diff line number Diff line
@@ -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 */

drivers/net/ethernet/amd/amd8111e.c

+1 −1
Original line number Diff line number Diff line
@@ -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