From 2c1450fb2f50b2f6bc4d01b2f4b639e963dec9cb Mon Sep 17 00:00:00 2001 From: Lovie Wang Date: Wed, 20 Sep 2023 10:51:38 +0800 Subject: [PATCH] misc: mods: Remove CONFIG_OF_RESOLVE & CONFIG_OF_DYNAMIC -OOT drivers are built unconditionally -MODS selects these two flags in Kconfig while Kconfig is not used in OOT drivers. So these two flags can't be selcted by default, need to remove the check. Bug 4300801 Change-Id: I2e19ecdfd34c499b3000823025d0ad34752ae9aa Signed-off-by: Lovie Wang Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2981830 Reviewed-by: Chris Dragan Reviewed-by: Laxman Dewangan GVS: Gerrit_Virtual_Submit --- drivers/misc/mods/mods_internal.h | 3 +-- drivers/misc/mods/mods_krnl.c | 9 +++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/misc/mods/mods_internal.h b/drivers/misc/mods/mods_internal.h index 72d1cc03..63e839a5 100644 --- a/drivers/misc/mods/mods_internal.h +++ b/drivers/misc/mods/mods_internal.h @@ -407,8 +407,7 @@ int mods_find_pci_dev(struct mods_client *client, #endif /* clock */ -#if defined(MODS_HAS_TEGRA) && defined(CONFIG_COMMON_CLK) && \ - defined(CONFIG_OF_RESOLVE) && defined(CONFIG_OF_DYNAMIC) +#if defined(MODS_HAS_TEGRA) && defined(CONFIG_COMMON_CLK) void mods_init_clock_api(void); void mods_shutdown_clock_api(void); #endif diff --git a/drivers/misc/mods/mods_krnl.c b/drivers/misc/mods/mods_krnl.c index da86061d..a4405c76 100644 --- a/drivers/misc/mods/mods_krnl.c +++ b/drivers/misc/mods/mods_krnl.c @@ -519,8 +519,7 @@ static int __init mods_init_module(void) return -EBUSY; #endif -#if defined(MODS_HAS_TEGRA) && defined(CONFIG_COMMON_CLK) && \ - defined(CONFIG_OF_RESOLVE) && defined(CONFIG_OF_DYNAMIC) +#if defined(MODS_HAS_TEGRA) && defined(CONFIG_COMMON_CLK) mods_init_clock_api(); #endif @@ -590,8 +589,7 @@ static void __exit mods_exit_module(void) misc_deregister(&mods_dev); -#if defined(MODS_HAS_TEGRA) && defined(CONFIG_COMMON_CLK) && \ - defined(CONFIG_OF_RESOLVE) && defined(CONFIG_OF_DYNAMIC) +#if defined(MODS_HAS_TEGRA) && defined(CONFIG_COMMON_CLK) mods_shutdown_clock_api(); #endif @@ -2520,8 +2518,7 @@ static long mods_krnl_ioctl(struct file *fp, esc_mods_get_kernel_version, MODS_GET_VERSION); break; -#if defined(MODS_HAS_TEGRA) && defined(CONFIG_COMMON_CLK) && \ - defined(CONFIG_OF_RESOLVE) && defined(CONFIG_OF_DYNAMIC) +#if defined(MODS_HAS_TEGRA) && defined(CONFIG_COMMON_CLK) case MODS_ESC_GET_CLOCK_HANDLE: MODS_IOCTL(MODS_ESC_GET_CLOCK_HANDLE, esc_mods_get_clock_handle, MODS_GET_CLOCK_HANDLE);