From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40757C433E0 for ; Sat, 30 Jan 2021 05:58:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 06E0764DDC for ; Sat, 30 Jan 2021 05:58:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233875AbhA3F6L (ORCPT ); Sat, 30 Jan 2021 00:58:11 -0500 Received: from mga01.intel.com ([192.55.52.88]:37812 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230321AbhA3Fz7 (ORCPT ); Sat, 30 Jan 2021 00:55:59 -0500 IronPort-SDR: kVBlipPUuF6WuLfINXgMpPVfL04mf1KwhorC4KJSM1hWX5q80FFzrg4tOYNofgBDiuK2SCndG4 QLajh5lX0oUw== X-IronPort-AV: E=McAfee;i="6000,8403,9879"; a="199358155" X-IronPort-AV: E=Sophos;i="5.79,387,1602572400"; d="scan'208";a="199358155" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jan 2021 18:21:30 -0800 IronPort-SDR: FPKXr9jDyE0q18bocgtGzOavLczovuLFRNq7I1ROWh+T+uadAlhEB5ilIGLhzKW77yDgSPGSD4 pJ4U03W9q+Pw== X-IronPort-AV: E=Sophos;i="5.79,387,1602572400"; d="scan'208";a="431263329" Received: from smtp.ostc.intel.com ([10.54.29.231]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jan 2021 18:21:29 -0800 Received: from mtg-dev.jf.intel.com (mtg-dev.jf.intel.com [10.54.74.10]) by smtp.ostc.intel.com (Postfix) with ESMTP id E25E2636B; Fri, 29 Jan 2021 18:21:29 -0800 (PST) Received: by mtg-dev.jf.intel.com (Postfix, from userid 1000) id D6DFB363683; Fri, 29 Jan 2021 18:21:29 -0800 (PST) From: mgross@linux.intel.com To: markgross@kernel.org, mgross@linux.intel.com, arnd@arndb.de, bp@suse.de, damien.lemoal@wdc.com, dragan.cvetic@xilinx.com, gregkh@linuxfoundation.org, corbet@lwn.net, palmerdabbelt@google.com, paul.walmsley@sifive.com, peng.fan@nxp.com, robh+dt@kernel.org, shawnguo@kernel.org, jassisinghbrar@gmail.com Cc: linux-kernel@vger.kernel.org, Srikanth Thokala Subject: [PATCH v4 12/34] misc: xlink-pcie: lh: Prepare changes for adding remote host driver Date: Fri, 29 Jan 2021 18:21:02 -0800 Message-Id: <20210130022124.65083-48-mgross@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210130022124.65083-1-mgross@linux.intel.com> References: <20210130022124.65083-1-mgross@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Srikanth Thokala Move logic that can be reused between local host and remote host to common/ folder Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Reviewed-by: Mark Gross Signed-off-by: Mark Gross Signed-off-by: Srikanth Thokala --- drivers/misc/xlink-pcie/{local_host => common}/core.h | 8 +++----- drivers/misc/xlink-pcie/{local_host => common}/util.c | 8 +++----- drivers/misc/xlink-pcie/{local_host => common}/util.h | 8 +++----- drivers/misc/xlink-pcie/{local_host => common}/xpcie.h | 8 +++----- drivers/misc/xlink-pcie/local_host/Makefile | 2 +- drivers/misc/xlink-pcie/local_host/core.c | 4 ++-- drivers/misc/xlink-pcie/local_host/epf.h | 4 ++-- 7 files changed, 17 insertions(+), 25 deletions(-) rename drivers/misc/xlink-pcie/{local_host => common}/core.h (96%) rename drivers/misc/xlink-pcie/{local_host => common}/util.c (97%) rename drivers/misc/xlink-pcie/{local_host => common}/util.h (91%) rename drivers/misc/xlink-pcie/{local_host => common}/xpcie.h (92%) diff --git a/drivers/misc/xlink-pcie/local_host/core.h b/drivers/misc/xlink-pcie/common/core.h similarity index 96% rename from drivers/misc/xlink-pcie/local_host/core.h rename to drivers/misc/xlink-pcie/common/core.h index 84985ef41a64..656b5e2dbfae 100644 --- a/drivers/misc/xlink-pcie/local_host/core.h +++ b/drivers/misc/xlink-pcie/common/core.h @@ -1,11 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/***************************************************************************** - * +/* * Intel Keem Bay XLink PCIe Driver * - * Copyright (C) 2020 Intel Corporation - * - ****************************************************************************/ + * Copyright (C) 2021 Intel Corporation + */ #ifndef XPCIE_CORE_HEADER_ #define XPCIE_CORE_HEADER_ diff --git a/drivers/misc/xlink-pcie/local_host/util.c b/drivers/misc/xlink-pcie/common/util.c similarity index 97% rename from drivers/misc/xlink-pcie/local_host/util.c rename to drivers/misc/xlink-pcie/common/util.c index ec808b0cd72b..d99125f61ba0 100644 --- a/drivers/misc/xlink-pcie/local_host/util.c +++ b/drivers/misc/xlink-pcie/common/util.c @@ -1,11 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-only -/***************************************************************************** - * +/* * Intel Keem Bay XLink PCIe Driver * - * Copyright (C) 2020 Intel Corporation - * - ****************************************************************************/ + * Copyright (C) 2021 Intel Corporation + */ #include "util.h" diff --git a/drivers/misc/xlink-pcie/local_host/util.h b/drivers/misc/xlink-pcie/common/util.h similarity index 91% rename from drivers/misc/xlink-pcie/local_host/util.h rename to drivers/misc/xlink-pcie/common/util.h index 908be897a61d..5295783b0437 100644 --- a/drivers/misc/xlink-pcie/local_host/util.h +++ b/drivers/misc/xlink-pcie/common/util.h @@ -1,11 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/***************************************************************************** - * +/* * Intel Keem Bay XLink PCIe Driver * - * Copyright (C) 2020 Intel Corporation - * - ****************************************************************************/ + * Copyright (C) 2021 Intel Corporation + */ #ifndef XPCIE_UTIL_HEADER_ #define XPCIE_UTIL_HEADER_ diff --git a/drivers/misc/xlink-pcie/local_host/xpcie.h b/drivers/misc/xlink-pcie/common/xpcie.h similarity index 92% rename from drivers/misc/xlink-pcie/local_host/xpcie.h rename to drivers/misc/xlink-pcie/common/xpcie.h index 8a559617daba..48529eb49be0 100644 --- a/drivers/misc/xlink-pcie/local_host/xpcie.h +++ b/drivers/misc/xlink-pcie/common/xpcie.h @@ -1,11 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/***************************************************************************** - * +/* * Intel Keem Bay XLink PCIe Driver * - * Copyright (C) 2020 Intel Corporation - * - ****************************************************************************/ + * Copyright (C) 2021 Intel Corporation + */ #ifndef XPCIE_HEADER_ #define XPCIE_HEADER_ diff --git a/drivers/misc/xlink-pcie/local_host/Makefile b/drivers/misc/xlink-pcie/local_host/Makefile index 28761751d43b..65df94c7e860 100644 --- a/drivers/misc/xlink-pcie/local_host/Makefile +++ b/drivers/misc/xlink-pcie/local_host/Makefile @@ -2,4 +2,4 @@ obj-$(CONFIG_XLINK_PCIE_LH_DRIVER) += mxlk_ep.o mxlk_ep-objs := epf.o mxlk_ep-objs += dma.o mxlk_ep-objs += core.o -mxlk_ep-objs += util.o +mxlk_ep-objs += ../common/util.o diff --git a/drivers/misc/xlink-pcie/local_host/core.c b/drivers/misc/xlink-pcie/local_host/core.c index c67ce2c3067d..2c4e29bce7f7 100644 --- a/drivers/misc/xlink-pcie/local_host/core.c +++ b/drivers/misc/xlink-pcie/local_host/core.c @@ -8,8 +8,8 @@ #include #include "epf.h" -#include "core.h" -#include "util.h" +#include "../common/core.h" +#include "../common/util.h" static struct xpcie *global_xpcie; diff --git a/drivers/misc/xlink-pcie/local_host/epf.h b/drivers/misc/xlink-pcie/local_host/epf.h index 7220cead0973..40bf4ff36580 100644 --- a/drivers/misc/xlink-pcie/local_host/epf.h +++ b/drivers/misc/xlink-pcie/local_host/epf.h @@ -11,8 +11,8 @@ #include #include -#include "xpcie.h" -#include "util.h" +#include "../common/xpcie.h" +#include "../common/util.h" #define XPCIE_DRIVER_NAME "mxlk_pcie_epf" #define XPCIE_DRIVER_DESC "Intel(R) xLink PCIe endpoint function driver" -- 2.17.1