From ac5bcc86bd8e5da2c6397bc433fb3ba6702a71a5 Mon Sep 17 00:00:00 2001 From: Ashish Mhetre Date: Fri, 19 Apr 2024 04:44:32 +0000 Subject: [PATCH] video: tegra: nvmap: Clean-up tegra_vpr_dev tegra_vpr_dev is defined at multiple places as extern variable. Keep it only in nvmap_exports.h as extern and define it in nvmap_init.c. Bug 4390638 Change-Id: I48f2b44c0f935366ce6319460da7b417918fea2d Signed-off-by: Ashish Mhetre Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3119454 Tested-by: mobile promotions Reviewed-by: mobile promotions --- drivers/video/tegra/nvmap/include/linux/nvmap_exports.h | 2 +- drivers/video/tegra/nvmap/nvmap_init.c | 2 +- drivers/video/tegra/nvmap/nvmap_ioctl.c | 1 - include/linux/platform/tegra/common.h | 2 -- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/video/tegra/nvmap/include/linux/nvmap_exports.h b/drivers/video/tegra/nvmap/include/linux/nvmap_exports.h index d1b72fd9..45684ef1 100644 --- a/drivers/video/tegra/nvmap/include/linux/nvmap_exports.h +++ b/drivers/video/tegra/nvmap/include/linux/nvmap_exports.h @@ -11,5 +11,5 @@ void *nvmap_dma_alloc_attrs(struct device *dev, size_t size, void nvmap_dma_free_attrs(struct device *dev, size_t size, void *cpu_addr, dma_addr_t dma_handle, unsigned long attrs); extern struct device tegra_vpr_dev; -extern struct device tegra_vpr_dev1; +extern struct device tegra_vpr1_dev; #endif /* __NVMAP_EXPORTS_H */ diff --git a/drivers/video/tegra/nvmap/nvmap_init.c b/drivers/video/tegra/nvmap/nvmap_init.c index e3e08590..d9b1b932 100644 --- a/drivers/video/tegra/nvmap/nvmap_init.c +++ b/drivers/video/tegra/nvmap/nvmap_init.c @@ -35,7 +35,7 @@ struct device __weak tegra_generic_dev; -struct device __weak tegra_vpr_dev; +struct device tegra_vpr_dev; EXPORT_SYMBOL(tegra_vpr_dev); struct device tegra_vpr1_dev; EXPORT_SYMBOL(tegra_vpr1_dev); diff --git a/drivers/video/tegra/nvmap/nvmap_ioctl.c b/drivers/video/tegra/nvmap/nvmap_ioctl.c index cf6a17a4..46dc9354 100644 --- a/drivers/video/tegra/nvmap/nvmap_ioctl.c +++ b/drivers/video/tegra/nvmap/nvmap_ioctl.c @@ -44,7 +44,6 @@ MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver); #endif -extern struct device tegra_vpr_dev; static ssize_t rw_handle(struct nvmap_client *client, struct nvmap_handle *h, int is_read, unsigned long h_offs, diff --git a/include/linux/platform/tegra/common.h b/include/linux/platform/tegra/common.h index 22a2202e..f7fbabea 100644 --- a/include/linux/platform/tegra/common.h +++ b/include/linux/platform/tegra/common.h @@ -24,11 +24,9 @@ extern phys_addr_t tegra_avp_kernel_size; void ahb_gizmo_writel(unsigned long val, void __iomem *reg); extern struct device tegra_generic_cma_dev; -extern struct device tegra_vpr_cma_dev; extern int tegra_with_secure_firmware; extern struct device tegra_generic_dev; -extern struct device tegra_vpr_dev; u32 tegra_get_bct_strapping(void); u32 tegra_get_fuse_opt_subrevision(void);