From 64e63a9ca35e32e0789202c4a1c1bb3b443c2408 Mon Sep 17 00:00:00 2001 From: Srishti Goel Date: Tue, 12 Nov 2024 04:41:49 +0000 Subject: [PATCH] Revert "PCI: endpoint: Fix DMA sanity for Linux v6.11" This reverts commit 2f3e25b601c241bf50a30b07a0aaa64413c57925. Reason for revert: Changing this to tests-oot directory Bug 4865361 Change-Id: I19002466616450cf073e2a66a1dd27da9e3409a2 Signed-off-by: Srishti Goel Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3246783 Reviewed-by: Bitan Biswas GVS: buildbot_gerritrpt --- .../pci/endpoint/functions/pci-epf-tegra-dma-sanity.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/pci/endpoint/functions/pci-epf-tegra-dma-sanity.c b/drivers/pci/endpoint/functions/pci-epf-tegra-dma-sanity.c index a826c98b..2a065c88 100644 --- a/drivers/pci/endpoint/functions/pci-epf-tegra-dma-sanity.c +++ b/drivers/pci/endpoint/functions/pci-epf-tegra-dma-sanity.c @@ -1,8 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. - -#include - +/* + * SPDX-FileCopyrightText: Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. + */ #include #include #include @@ -350,11 +349,7 @@ static const struct pci_epf_device_id pcie_dma_epf_sanity_ids[] = { }; static const struct pci_epc_event_ops pci_epf_dma_sanity_event_ops = { -#if defined(NV_PCI_EPC_EVENT_OPS_STRUCT_HAS_EPC_INIT) /* Linux v6.11 */ - .epc_init = pcie_epf_dma_sanity_core_init, -#else .core_init = pcie_epf_dma_sanity_core_init, -#endif }; static struct pci_epf_ops ops = {