diff --git a/drivers/video/tegra/host/nvdla/nvdla.c b/drivers/video/tegra/host/nvdla/nvdla.c
index da63dd41..080cc720 100644
--- a/drivers/video/tegra/host/nvdla/nvdla.c
+++ b/drivers/video/tegra/host/nvdla/nvdla.c
@@ -593,7 +593,7 @@ out:
 }
 
 /* Free utilization rate memory */
-void nvdla_free_utilization_rate_memory(struct platform_device *pdev)
+static void nvdla_free_utilization_rate_memory(struct platform_device *pdev)
 {
 	struct nvhost_device_data *pdata = platform_get_drvdata(pdev);
 	struct nvdla_device *nvdla_dev = pdata->private_data;
@@ -609,7 +609,7 @@ void nvdla_free_utilization_rate_memory(struct platform_device *pdev)
 }
 
 /* Allocate memory to store the resource utilization rate */
-int nvdla_alloc_utilization_rate_memory(struct platform_device *pdev)
+static int nvdla_alloc_utilization_rate_memory(struct platform_device *pdev)
 {
 	struct nvhost_device_data *pdata = platform_get_drvdata(pdev);
 	struct nvdla_device *nvdla_dev = pdata->private_data;
@@ -629,7 +629,7 @@ int nvdla_alloc_utilization_rate_memory(struct platform_device *pdev)
 }
 
 /* Free window size memory */
-void nvdla_free_window_size_memory(struct platform_device *pdev)
+static void nvdla_free_window_size_memory(struct platform_device *pdev)
 {
 	struct nvhost_device_data *pdata = platform_get_drvdata(pdev);
 	struct nvdla_device *nvdla_dev = pdata->private_data;
@@ -645,7 +645,7 @@ void nvdla_free_window_size_memory(struct platform_device *pdev)
 }
 
 /* Allocate memory to store the window size for which the utilization rate is computed */
-int nvdla_alloc_window_size_memory(struct platform_device *pdev)
+static int nvdla_alloc_window_size_memory(struct platform_device *pdev)
 {
 	struct nvhost_device_data *pdata = platform_get_drvdata(pdev);
 	struct nvdla_device *nvdla_dev = pdata->private_data;
diff --git a/drivers/video/tegra/host/nvdla/nvdla_t194.h b/drivers/video/tegra/host/nvdla/nvdla_t194.h
index 1f1b6b86..dda1c34d 100644
--- a/drivers/video/tegra/host/nvdla/nvdla_t194.h
+++ b/drivers/video/tegra/host/nvdla/nvdla_t194.h
@@ -13,7 +13,7 @@
 #include "nvdla_cg_regs.h"
 #include "dla_t19x_fw_version.h"
 
-struct nvhost_device_data t19_nvdla0_info = {
+static struct nvhost_device_data t19_nvdla0_info = {
 	.devfs_name_family	= "nvdla",
 	.class			= NV_DLA0_CLASS_ID,
 	.clocks			= {
@@ -49,7 +49,7 @@ struct nvhost_device_data t19_nvdla0_info = {
 	.firmware_not_in_subdir = true,
 };
 
-struct nvhost_device_data t19_nvdla1_info = {
+static struct nvhost_device_data t19_nvdla1_info = {
 	.devfs_name_family	= "nvdla",
 	.class			= NV_DLA1_CLASS_ID,
 	.clocks			= {
diff --git a/drivers/video/tegra/host/nvdla/nvdla_t234.h b/drivers/video/tegra/host/nvdla/nvdla_t234.h
index 5328986e..a24e2ba3 100644
--- a/drivers/video/tegra/host/nvdla/nvdla_t234.h
+++ b/drivers/video/tegra/host/nvdla/nvdla_t234.h
@@ -13,7 +13,7 @@
 #include "nvdla_cg_regs.h"
 #include "dla_t23x_fw_version.h"
 
-struct nvhost_device_data t23x_nvdla0_info = {
+static struct nvhost_device_data t23x_nvdla0_info = {
 	.devfs_name_family	= "nvdla",
 	.class			= NV_DLA0_CLASS_ID,
 	.clocks			= {
@@ -44,7 +44,7 @@ struct nvhost_device_data t23x_nvdla0_info = {
 	.firmware_not_in_subdir = true,
 };
 
-struct nvhost_device_data t23x_nvdla1_info = {
+static struct nvhost_device_data t23x_nvdla1_info = {
 	.devfs_name_family	= "nvdla",
 	.class			= NV_DLA1_CLASS_ID,
 	.clocks			= {