From 76e580a325d9719dd4f45cf38f5bdfee337c59f3 Mon Sep 17 00:00:00 2001 From: Nicolin Chen Date: Mon, 6 Aug 2018 20:48:47 -0700 Subject: [PATCH] media: tegra: Remove temp WAR for function calls There are two type of temp WARs in the nvidia repo: 1) Some functions are defined in driver files that depend on CONFIG_TEGRA_GRHOST_NVCSI. So these function call should have dependency protection in the header file. 2) The powergate header file is adding an unnecessary define check for tegra194-powergate.h and this broke two places that were referring one of the defines in it. So this change fix the WARs above by: a) Removing those temp WARs by adding dummy NOP functions for those platofrms that don't have CONFIG_TEGRA_GRHOST_NVCSI. b) Removing the define check in tegra194-powergate.h and the version check when referring TEGRA194_POWER_DOMAIN_DISP. Bug 2284925 Change-Id: Iad86bfe20f2981b3d31bccf5f51184799fe7e289 Signed-off-by: Nicolin Chen Reviewed-on: https://git-master.nvidia.com/r/1803439 GVS: Gerrit_Virtual_Submit Reviewed-by: David Bang Reviewed-by: Sachin Nikam Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/misc/tegra-cec/tegra_cec.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/misc/tegra-cec/tegra_cec.c b/drivers/misc/tegra-cec/tegra_cec.c index 81957418..95c9ab9e 100644 --- a/drivers/misc/tegra-cec/tegra_cec.c +++ b/drivers/misc/tegra-cec/tegra_cec.c @@ -830,12 +830,7 @@ static struct tegra_cec_soc tegra186_soc_data = { }; static struct tegra_cec_soc tegra194_soc_data = { -// temporary WAR to get 4.4 builds working -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) - .powergate_id = TEGRA186_POWER_DOMAIN_DISP, -#else .powergate_id = TEGRA194_POWER_DOMAIN_DISP, -#endif }; static struct of_device_id tegra_cec_of_match[] = {