diff mbox

[1/1] ixgbe: replace defined with IS_ENABLED

Message ID 1473866814-21374-1-git-send-email-zyjzyj2000@gmail.com
State Awaiting Upstream, archived
Delegated to: David Miller
Headers show

Commit Message

Zhu Yanjun Sept. 14, 2016, 3:26 p.m. UTC 
From: Zhu Yanjun <zyjzyj2000@gmail.com>

Replace defined macro with IS_ENABLED in ixgbe.h file

Signed-off-by: Zhu Yanjun <zyjzyj2000@gmail.com>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tantilov, Emil S Sept. 19, 2016, 5 p.m. UTC | #1 
>-----Original Message-----
>From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org] On
>Behalf Of zyjzyj2000@gmail.com
>Sent: Wednesday, September 14, 2016 8:27 AM
>To: netdev@vger.kernel.org; intel-wired-lan@lists.osuosl.org; Kirsher,
>Jeffrey T <jeffrey.t.kirsher@intel.com>; zyjzyj2000@gmail.com; e1000-
>devel@lists.sourceforge.net
>Subject: [PATCH 1/1] ixgbe: replace defined with IS_ENABLED
>
>From: Zhu Yanjun <zyjzyj2000@gmail.com>
>
>Replace defined macro with IS_ENABLED in ixgbe.h file
>
>Signed-off-by: Zhu Yanjun <zyjzyj2000@gmail.com>
>---
> drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
>b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
>index 9475ff9..f8bc1d0 100644
>--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
>+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
>@@ -45,7 +45,7 @@
> #include "ixgbe_type.h"
> #include "ixgbe_common.h"
> #include "ixgbe_dcb.h"
>-#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
>+#if IS_ENABLED(CONFIG_FCOE)
> #define IXGBE_FCOE
> #include "ixgbe_fcoe.h"
> #endif /* CONFIG_FCOE or CONFIG_FCOE_MODULE */
>--
>2.7.4

Already taken care of by the following patch:
http://patchwork.ozlabs.org/patch/668894/

Thanks,
Emil
Zhu Yanjun Sept. 20, 2016, 1:09 p.m. UTC | #2 
how about this patch "ixgbe: remove the useless header file ixgbe_type.h"?

On Tue, Sep 20, 2016 at 1:00 AM, Tantilov, Emil S
<emil.s.tantilov@intel.com> wrote:
>>-----Original Message-----
>>From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org] On
>>Behalf Of zyjzyj2000@gmail.com
>>Sent: Wednesday, September 14, 2016 8:27 AM
>>To: netdev@vger.kernel.org; intel-wired-lan@lists.osuosl.org; Kirsher,
>>Jeffrey T <jeffrey.t.kirsher@intel.com>; zyjzyj2000@gmail.com; e1000-
>>devel@lists.sourceforge.net
>>Subject: [PATCH 1/1] ixgbe: replace defined with IS_ENABLED
>>
>>From: Zhu Yanjun <zyjzyj2000@gmail.com>
>>
>>Replace defined macro with IS_ENABLED in ixgbe.h file
>>
>>Signed-off-by: Zhu Yanjun <zyjzyj2000@gmail.com>
>>---
>> drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>>diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
>>b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
>>index 9475ff9..f8bc1d0 100644
>>--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
>>+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
>>@@ -45,7 +45,7 @@
>> #include "ixgbe_type.h"
>> #include "ixgbe_common.h"
>> #include "ixgbe_dcb.h"
>>-#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
>>+#if IS_ENABLED(CONFIG_FCOE)
>> #define IXGBE_FCOE
>> #include "ixgbe_fcoe.h"
>> #endif /* CONFIG_FCOE or CONFIG_FCOE_MODULE */
>>--
>>2.7.4
>
> Already taken care of by the following patch:
> http://patchwork.ozlabs.org/patch/668894/
>
> Thanks,
> Emil
>
diff mbox

Patch

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index 9475ff9..f8bc1d0 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -45,7 +45,7 @@ 
 #include "ixgbe_type.h"
 #include "ixgbe_common.h"
 #include "ixgbe_dcb.h"
-#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
+#if IS_ENABLED(CONFIG_FCOE)
 #define IXGBE_FCOE
 #include "ixgbe_fcoe.h"
 #endif /* CONFIG_FCOE or CONFIG_FCOE_MODULE */