[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1468515969-14805-1-git-send-email-javier@osg.samsung.com>
Date: Thu, 14 Jul 2016 13:06:09 -0400
From: Javier Martinez Canillas <javier@....samsung.com>
To: linux-kernel@...r.kernel.org
Cc: Javier Martinez Canillas <javier@....samsung.com>,
devel@...verdev.osuosl.org, Aaro Koskinen <aaro.koskinen@....fi>,
Aybuke Ozdemir <aybuke.147@...il.com>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Cristina Moraru <cristina.moraru09@...il.com>,
Laura Garcia Liebana <nevola@...il.com>,
Bhaktipriya Shridhar <bhaktipriya96@...il.com>,
David Daney <david.daney@...ium.com>
Subject: [PATCH] staging: octeon: 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.
Signed-off-by: Javier Martinez Canillas <javier@....samsung.com>
---
drivers/staging/octeon/ethernet.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index e9cd5f242921..c0c62143ffc8 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -238,7 +238,7 @@ static int cvm_oct_common_change_mtu(struct net_device *dev, int new_mtu)
struct octeon_ethernet *priv = netdev_priv(dev);
int interface = INTERFACE(priv->port);
int index = INDEX(priv->port);
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
+#if IS_ENABLED(CONFIG_VLAN_8021Q)
int vlan_bytes = 4;
#else
int vlan_bytes = 0;
--
2.5.5
Powered by blists - more mailing lists