From: Javier Martinez Canillas <javier@osg.samsung.com>
Date: Mon, 12 Sep 2016 14:03:35 +0000 (-0400)
Subject: bnx2: use IS_ENABLED() instead of checking for built-in or module
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~9295^2~217
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=da556d6a1a386aaf9ead99ef5574497c535bd26e;p=mirror_ubuntu-focal-kernel.git

bnx2: 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: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 8fc3f3c137f8..ecd357dbb1d4 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -50,7 +50,7 @@
 #include <linux/log2.h>
 #include <linux/aer.h>
 
-#if defined(CONFIG_CNIC) || defined(CONFIG_CNIC_MODULE)
+#if IS_ENABLED(CONFIG_CNIC)
 #define BCM_CNIC 1
 #include "cnic_if.h"
 #endif