From patchwork Mon Apr 24 22:47:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zhang X-Patchwork-Id: 126483 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1567A429DE; Mon, 24 Apr 2023 16:28:09 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CA45A410D0; Mon, 24 Apr 2023 16:28:08 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 0D78F40FAE for ; Mon, 24 Apr 2023 16:28:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1682346487; x=1713882487; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=QodHnvhzqjvpd7pgJ9tmPqCyBzlNUxn1BVaHFrIXPSM=; b=YwvGuz/JLLLXHyARy8e7dLKoCejrf1O/DayzSuHCU8STq2LxwX2SacqM T8a4/5GUAhJEoAm2RJNpKaQiacOemwV8RJq+hFUlc44NHC7ohI9CcfEUI aOF0D1SQU24YE2Zsl2NdBCetrZcwdp4oJfRIoqWTMyk0xxud6GZbli4Ss n82ItKgTGQfEj6DDQFesX80lyO7IdtrIO3sbkyU1yXvfNJrB5rpHM+kKN J3a9xksj4g9tgmSnIBqx10B7vEXlKBU1/3ueBM2HrpQhgjknqIPkJHsz7 ikYQwVhvoaipqHdGk68VRTUuw8mZKh2AcewThunu5Ild2PjjHhRp3K6gT w==; X-IronPort-AV: E=McAfee;i="6600,9927,10690"; a="345219055" X-IronPort-AV: E=Sophos;i="5.99,222,1677571200"; d="scan'208";a="345219055" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2023 07:28:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10690"; a="686861937" X-IronPort-AV: E=Sophos;i="5.99,222,1677571200"; d="scan'208";a="686861937" Received: from dpdk-qzhan15-test02.sh.intel.com ([10.67.115.37]) by orsmga007.jf.intel.com with ESMTP; 24 Apr 2023 07:28:04 -0700 From: Qi Zhang To: beilei.xing@intel.com Cc: dev@dpdk.org, Qi Zhang Subject: [PATCH] common/idpf: remove unnecessary compile option Date: Mon, 24 Apr 2023 18:47:00 -0400 Message-Id: <20230424224700.997910-1-qi.z.zhang@intel.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Remove compile option "__KERNEL" which should not be considered in DPDK. Also only #include in idpf_osdep.h. Signed-off-by: Qi Zhang --- drivers/common/idpf/base/idpf_controlq.c | 5 ----- drivers/common/idpf/base/idpf_controlq.h | 8 -------- drivers/common/idpf/base/idpf_controlq_api.h | 6 ------ drivers/common/idpf/base/idpf_lan_txrx.h | 3 +-- drivers/common/idpf/base/idpf_osdep.h | 1 + 5 files changed, 2 insertions(+), 21 deletions(-) diff --git a/drivers/common/idpf/base/idpf_controlq.c b/drivers/common/idpf/base/idpf_controlq.c index 3af81e5a64..93a3a20fd1 100644 --- a/drivers/common/idpf/base/idpf_controlq.c +++ b/drivers/common/idpf/base/idpf_controlq.c @@ -162,11 +162,6 @@ int idpf_ctlq_add(struct idpf_hw *hw, switch (qinfo->type) { case IDPF_CTLQ_TYPE_MAILBOX_RX: is_rxq = true; -#ifdef __KERNEL__ - fallthrough; -#else - /* fallthrough */ -#endif /* __KERNEL__ */ case IDPF_CTLQ_TYPE_MAILBOX_TX: status = idpf_ctlq_alloc_ring_res(hw, *cq_out); break; diff --git a/drivers/common/idpf/base/idpf_controlq.h b/drivers/common/idpf/base/idpf_controlq.h index e7b0d803b3..fea8dda618 100644 --- a/drivers/common/idpf/base/idpf_controlq.h +++ b/drivers/common/idpf/base/idpf_controlq.h @@ -5,14 +5,8 @@ #ifndef _IDPF_CONTROLQ_H_ #define _IDPF_CONTROLQ_H_ -#ifdef __KERNEL__ -#include -#endif - -#ifndef __KERNEL__ #include "idpf_osdep.h" #include "idpf_alloc.h" -#endif #include "idpf_controlq_api.h" /* Maximum buffer lengths for all control queue types */ @@ -26,14 +20,12 @@ ((u16)((((R)->next_to_clean > (R)->next_to_use) ? 0 : (R)->ring_size) + \ (R)->next_to_clean - (R)->next_to_use - 1)) -#ifndef __KERNEL__ /* Data type manipulation macros. */ #define IDPF_HI_DWORD(x) ((u32)((((x) >> 16) >> 16) & 0xFFFFFFFF)) #define IDPF_LO_DWORD(x) ((u32)((x) & 0xFFFFFFFF)) #define IDPF_HI_WORD(x) ((u16)(((x) >> 16) & 0xFFFF)) #define IDPF_LO_WORD(x) ((u16)((x) & 0xFFFF)) -#endif /* Control Queue default settings */ #define IDPF_CTRL_SQ_CMD_TIMEOUT 250 /* msecs */ diff --git a/drivers/common/idpf/base/idpf_controlq_api.h b/drivers/common/idpf/base/idpf_controlq_api.h index 32d17baadf..e80debebb8 100644 --- a/drivers/common/idpf/base/idpf_controlq_api.h +++ b/drivers/common/idpf/base/idpf_controlq_api.h @@ -5,14 +5,8 @@ #ifndef _IDPF_CONTROLQ_API_H_ #define _IDPF_CONTROLQ_API_H_ -#ifdef __KERNEL__ -#include "idpf_mem.h" -#else /* !__KERNEL__ */ #include "idpf_osdep.h" -#include -#endif /* !__KERNEL__ */ - struct idpf_hw; /* Used for queue init, response and events */ diff --git a/drivers/common/idpf/base/idpf_lan_txrx.h b/drivers/common/idpf/base/idpf_lan_txrx.h index 98484b267c..2d635a0b9c 100644 --- a/drivers/common/idpf/base/idpf_lan_txrx.h +++ b/drivers/common/idpf/base/idpf_lan_txrx.h @@ -4,9 +4,8 @@ #ifndef _IDPF_LAN_TXRX_H_ #define _IDPF_LAN_TXRX_H_ -#ifndef __KERNEL__ + #include "idpf_osdep.h" -#endif enum idpf_rss_hash { /* Values 0 - 28 are reserved for future use */ diff --git a/drivers/common/idpf/base/idpf_osdep.h b/drivers/common/idpf/base/idpf_osdep.h index 99ae9cf60a..78049e25b4 100644 --- a/drivers/common/idpf/base/idpf_osdep.h +++ b/drivers/common/idpf/base/idpf_osdep.h @@ -23,6 +23,7 @@ #include #include #include +#include #define INLINE inline #define STATIC static