netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Bruce Allan <bruce.w.allan@intel.com>,
	netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
	jogreene@redhat.com, Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 10/10] fm10k: IS_ENABLED() is not appropriate for boolean kconfig option
Date: Tue, 22 Dec 2015 06:02:12 -0800	[thread overview]
Message-ID: <1450792932-96015-11-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1450792932-96015-1-git-send-email-jeffrey.t.kirsher@intel.com>

From: Bruce Allan <bruce.w.allan@intel.com>

Tri-states need 'if IS_ENABLED()', booleans should use 'ifdef'.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
index 6fdb782..662569d 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
@@ -20,7 +20,7 @@
 
 #include "fm10k.h"
 #include <linux/vmalloc.h>
-#if IS_ENABLED(CONFIG_FM10K_VXLAN)
+#ifdef CONFIG_FM10K_VXLAN
 #include <net/vxlan.h>
 #endif /* CONFIG_FM10K_VXLAN */
 
@@ -556,11 +556,11 @@ int fm10k_open(struct net_device *netdev)
 	if (err)
 		goto err_set_queues;
 
-#if IS_ENABLED(CONFIG_FM10K_VXLAN)
+#ifdef CONFIG_FM10K_VXLAN
 	/* update VXLAN port configuration */
 	vxlan_get_rx_port(netdev);
-
 #endif
+
 	fm10k_up(interface);
 
 	return 0;
-- 
2.5.0

  parent reply	other threads:[~2015-12-22 14:03 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-22 14:02 [net-next 00/10][pull request] 100GbE Intel Wired LAN Driver Updates 2015-12-22 Jeff Kirsher
2015-12-22 14:02 ` [net-next 01/10] fm10k: don't initialize fm10k_workqueue at global level Jeff Kirsher
2015-12-22 14:02 ` [net-next 02/10] fm10k: correctly pack TLV structures and explain reasoning Jeff Kirsher
2015-12-22 14:02 ` [net-next 03/10] fm10k: Cleanup exception handling for changing queues Jeff Kirsher
2015-12-22 14:02 ` [net-next 04/10] fm10k: use ether_addr_equal instead of memcmp Jeff Kirsher
2015-12-22 14:02 ` [net-next 05/10] fm10k: address operator not needed when declaring function pointers Jeff Kirsher
2015-12-22 14:02 ` [net-next 06/10] fm10k: constify fm10k_mac_ops, fm10k_iov_ops and fm10k_info structures Jeff Kirsher
2015-12-22 14:02 ` [net-next 07/10] fm10k: remove unused struct element Jeff Kirsher
2015-12-22 14:02 ` [net-next 08/10] fm10k: use true/false for boolean get_host_state Jeff Kirsher
2015-12-22 14:02 ` [net-next 09/10] fm10k: cleanup mailbox code comments etc Jeff Kirsher
2015-12-22 14:02 ` Jeff Kirsher [this message]
2015-12-22 19:49 ` [net-next 00/10][pull request] 100GbE Intel Wired LAN Driver Updates 2015-12-22 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=1450792932-96015-11-git-send-email-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=bruce.w.allan@intel.com \
    --cc=davem@davemloft.net \
    --cc=jogreene@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=nhorman@redhat.com \
    --cc=sassmann@redhat.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;
as well as URLs for NNTP newsgroup(s).