From: Javier Martinez Canillas <javier@osg.samsung.com>
To: linux-kernel@vger.kernel.org
Cc: Javier Martinez Canillas <javier@osg.samsung.com>,
devel@driverdev.osuosl.org, Aaro Koskinen <aaro.koskinen@iki.fi>,
Aybuke Ozdemir <aybuke.147@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Cristina Moraru <cristina.moraru09@gmail.com>,
Laura Garcia Liebana <nevola@gmail.com>,
Bhaktipriya Shridhar <bhaktipriya96@gmail.com>,
David Daney <david.daney@cavium.com>
Subject: [PATCH] staging: octeon: Use IS_ENABLED() instead of checking for built-in or module
Date: Thu, 14 Jul 2016 13:06:09 -0400 [thread overview]
Message-ID: <1468515969-14805-1-git-send-email-javier@osg.samsung.com> (raw)
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@osg.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
next reply other threads:[~2016-07-14 17:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-14 17:06 Javier Martinez Canillas [this message]
2016-07-14 17:26 ` David Daney
2016-08-21 16:02 ` Greg Kroah-Hartman
2016-08-25 13:54 ` Javier Martinez Canillas
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=1468515969-14805-1-git-send-email-javier@osg.samsung.com \
--to=javier@osg.samsung.com \
--cc=aaro.koskinen@iki.fi \
--cc=aybuke.147@gmail.com \
--cc=bhaktipriya96@gmail.com \
--cc=cristina.moraru09@gmail.com \
--cc=david.daney@cavium.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nevola@gmail.com \
/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®