From patchwork Wed Jul 20 10:41:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yanjun X-Patchwork-Id: 650627 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rvYQM34YJz9syB for ; Wed, 20 Jul 2016 20:42:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754042AbcGTKm1 (ORCPT ); Wed, 20 Jul 2016 06:42:27 -0400 Received: from [123.119.179.77] ([123.119.179.77]:38274 "EHLO mail.zhuyj.com" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753992AbcGTKl7 (ORCPT ); Wed, 20 Jul 2016 06:41:59 -0400 Received: from mail.zhuyj.com.com (mail.zhuyj.com [192.168.2.101]) by mail.zhuyj.com (Postfix) with ESMTPA id 715005C33C0; Wed, 20 Jul 2016 18:41:56 +0800 (CST) From: zyjzyj2000@gmail.com To: jeffrey.t.kirsher@intel.com, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, e1000-devel@lists.sourceforge.net Cc: Zhu Yanjun Subject: [PATCH 1/1] ixgbevf: replace enum with MACROs Date: Wed, 20 Jul 2016 18:41:53 +0800 Message-Id: <1469011313-30044-2-git-send-email-zyjzyj2000@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1469011313-30044-1-git-send-email-zyjzyj2000@gmail.com> References: <1469011313-30044-1-git-send-email-zyjzyj2000@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Zhu Yanjun With the original enum, when a several bits state is set, it is possible that the wrong test occurs. For example, a state is 0x3, its bits are 11. When testing a state 0x2 whose bits are 10, it is difficult to confirm that state 0x2 is set or not. As such, the MACROs are defined to avoid the above error. Signed-off-by: Zhu Yanjun --- drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h index 60fc63b..d37b910 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h @@ -436,18 +436,16 @@ struct ixgbevf_adapter { u8 rss_indir_tbl[IXGBEVF_X550_VFRETA_SIZE]; }; -enum ixbgevf_state_t { - __IXGBEVF_TESTING, - __IXGBEVF_RESETTING, - __IXGBEVF_DOWN, - __IXGBEVF_DISABLED, - __IXGBEVF_REMOVING, - __IXGBEVF_SERVICE_SCHED, - __IXGBEVF_SERVICE_INITED, - __IXGBEVF_RESET_REQUESTED, - __IXGBEVF_QUEUE_RESET_REQUESTED, - __IXGBEVF_HW_RESETTING, -}; +#define __IXGBEVF_TESTING 0x0001 +#define __IXGBEVF_RESETTING 0x0002 +#define __IXGBEVF_DOWN 0x0004 +#define __IXGBEVF_DISABLED 0x0008 +#define __IXGBEVF_REMOVING 0x0010 +#define __IXGBEVF_SERVICE_SCHED 0x0020 +#define __IXGBEVF_SERVICE_INITED 0x0040 +#define __IXGBEVF_RESET_REQUESTED 0x0080 +#define __IXGBEVF_QUEUE_RESET_REQUESTED 0x0100 +#define __IXGBEVF_HW_RESETTING 0x0200 enum ixgbevf_boards { board_82599_vf,