From f1e2cd8dea5099346acf74b8ec48b28c11ad1f98 Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Tue, 15 Nov 2022 12:48:58 +0000 Subject: [PATCH] video: tegra: nvmap: Remove unused code The function __nvmap_kmap() is only supported for Linux kernels prior to v5.4 and so we can remove the code in the function for kernel greater or equal to Linux v6.0. Bug 3767126 Change-Id: Ice2384ce28f268ce453236db36fc82d6781eb716 Signed-off-by: Jon Hunter Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2809529 Tested-by: mobile promotions Reviewed-by: mobile promotions --- drivers/video/tegra/nvmap/nvmap_core.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/video/tegra/nvmap/nvmap_core.c b/drivers/video/tegra/nvmap/nvmap_core.c index 8a1d15a1..c34afeea 100644 --- a/drivers/video/tegra/nvmap/nvmap_core.c +++ b/drivers/video/tegra/nvmap/nvmap_core.c @@ -84,11 +84,8 @@ void *__nvmap_kmap(struct nvmap_handle *h, unsigned int pagenum) h->pgalloc.pages[pagenum])); else paddr = h->carveout->base + pagenum * PAGE_SIZE; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0) - addr = ioremap_prot(phys_addr, PAGE_SIZE, pgprot_val(prot)); -#else + addr = __ioremap(paddr, PAGE_SIZE, prot); -#endif if (addr == NULL) goto out; kaddr = (unsigned long)addr;