From 2f11adce1f6539447e559f1e01cd53b2bbdcbb4e Mon Sep 17 00:00:00 2001
From: Laxman Dewangan <ldewangan@nvidia.com>
Date: Tue, 18 Apr 2023 15:47:33 +0000
Subject: [PATCH] nvsciipc: Get rid of explicit handling of
 CONFIG_TEGRA_OOT_MODULE

The nvsciipc driver inside nvidia-oot is always build
as module and hence it is not required to handle the
non-defined case of CONFIG_TEGRA_OOT_MODULE.

Bug 4074863

Change-Id: If1e911a3702625eee635446446eeb98f27e74ebe
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2890059
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
Reviewed-by: Jonathan Hunter <jonathanh@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
---
 drivers/misc/nvsciipc/Makefile   | 8 +++-----
 drivers/misc/nvsciipc/nvsciipc.c | 2 --
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/misc/nvsciipc/Makefile b/drivers/misc/nvsciipc/Makefile
index 5ef9d2fe..94082827 100644
--- a/drivers/misc/nvsciipc/Makefile
+++ b/drivers/misc/nvsciipc/Makefile
@@ -1,15 +1,13 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 
 #
 # Makefile for NvSciIpc driver
 #
 
-ifeq ($(CONFIG_TEGRA_OOT_MODULE),m)
-ccflags-y += -DCONFIG_TEGRA_OOT_MODULE
 ifeq ($(CONFIG_TEGRA_VIRTUALIZATION),y)
 ccflags-y += -DCONFIG_TEGRA_VIRTUALIZATION
 endif
-endif
+
 obj-m += nvsciipc.o
 
diff --git a/drivers/misc/nvsciipc/nvsciipc.c b/drivers/misc/nvsciipc/nvsciipc.c
index b4bcc6a1..8a7d1f62 100644
--- a/drivers/misc/nvsciipc/nvsciipc.c
+++ b/drivers/misc/nvsciipc/nvsciipc.c
@@ -33,9 +33,7 @@
 
 #ifdef CONFIG_TEGRA_VIRTUALIZATION
 #include <soc/tegra/virt/syscalls.h>
-#ifdef CONFIG_TEGRA_OOT_MODULE
 #include <soc/tegra/virt/hv-ivc.h>
-#endif /* CONFIG_TEGRA_OOT_MODULE */
 #include <uapi/linux/tegra-ivc-dev.h>
 #endif /* CONFIG_TEGRA_VIRTUALIZATION */