From patchwork Wed Oct 4 16:28:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 132307 X-Patchwork-Delegate: jerinj@marvell.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 6DF10426B7; Wed, 4 Oct 2023 18:35:28 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 581A1402B3; Wed, 4 Oct 2023 18:35:26 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 375FB402A9 for ; Wed, 4 Oct 2023 18:35:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696437324; x=1727973324; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=iawmBXrn0HT0dQxRCN/FhFp7rP6Zqr/1lXlawedPMMU=; b=iisZ+Uckt48A680hLod+m8KB04MdxnSIfN2dVg40K3BQxEuAH/D6UBxp iFB5nTHnq29/MkRXLQcZjAxlD+bw1Fv++n0o8PZE9xtafVsYQCPoBSvao k4tXH+zRqBHCNzDXB5qWO/Qg6U2NOiOSoSPiXL70prb9vy1UxgANcpRIZ 8CAfge7PFOjXgRPMSbE7JYnzKta0Sg+nP2/0eQJxKPCt2aEQHnTfAnuGU l9/7RmUxsZgxoImcmvGUQtbu95cU1bqACr5QSQDDtQN2GNJxEQUPmULpQ ToYmh6+NYb9SGVmwUl0tqG7ek6Y8quuUppTRTUWbDltARvdSwuBSmTCd3 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10853"; a="386051506" X-IronPort-AV: E=Sophos;i="6.03,200,1694761200"; d="scan'208";a="386051506" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Oct 2023 09:28:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10853"; a="867464444" X-IronPort-AV: E=Sophos;i="6.03,200,1694761200"; d="scan'208";a="867464444" Received: from silpixa00401385.ir.intel.com ([10.237.214.135]) by fmsmga002.fm.intel.com with ESMTP; 04 Oct 2023 09:28:44 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Jerin Jacob , Naga Harish K S V Subject: [PATCH v2] eventdev: drop custom OS defines Date: Wed, 4 Oct 2023 17:28:34 +0100 Message-Id: <20231004162834.249828-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003170115.571133-1-bruce.richardson@intel.com> References: <20231003170115.571133-1-bruce.richardson@intel.com> 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 The eventdev library doesn't need to put in place its own defines for Linux and BSD. There are already defines for the OS environment in rte_config.h that can be re-used, but since these are just for identifying Linux/non-Linux, we can just check for the standard define '__linux__' instead. Signed-off-by: Bruce Richardson Acked-by: Jerin Jacob --- lib/eventdev/meson.build | 6 ------ lib/eventdev/rte_event_eth_rx_adapter.c | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/eventdev/meson.build b/lib/eventdev/meson.build index 250abcb154..a04bb86f0f 100644 --- a/lib/eventdev/meson.build +++ b/lib/eventdev/meson.build @@ -7,12 +7,6 @@ if is_windows subdir_done() endif -if is_linux - cflags += '-DLINUX' -else - cflags += '-DBSD' -endif - sources = files( 'eventdev_private.c', 'eventdev_trace_points.c', diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c index ea7106a1fe..6db03adf04 100644 --- a/lib/eventdev/rte_event_eth_rx_adapter.c +++ b/lib/eventdev/rte_event_eth_rx_adapter.c @@ -5,7 +5,7 @@ #include #include #include -#if defined(LINUX) +#if defined(__linux__) #include #endif #include @@ -1567,11 +1567,11 @@ rxa_default_conf_cb(uint8_t id, uint8_t dev_id, static int rxa_epoll_create1(void) { -#if defined(LINUX) +#if defined(__linux__) int fd; fd = epoll_create1(EPOLL_CLOEXEC); return fd < 0 ? -errno : fd; -#elif defined(BSD) +#else return -ENOTSUP; #endif }