From: Srikanth Thokala <srikanth.thok...@intel.com> Move logic that can be reused between local host and remote host to common/ folder
Cc: Arnd Bergmann <a...@arndb.de> Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org> Reviewed-by: Mark Gross <mgr...@linux.intel.com> Signed-off-by: Mark Gross <mgr...@linux.intel.com> Signed-off-by: Srikanth Thokala <srikanth.thok...@intel.com> --- 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 <linux/of_reserved_mem.h> #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 <linux/pci-epc.h> #include <linux/pci-epf.h> -#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