diff --git a/drivers/staging/platform/tegra/gte/tegra194_gte.c b/drivers/staging/platform/tegra/gte/tegra194_gte.c
index f70fb8a0..79dcfc0b 100644
--- a/drivers/staging/platform/tegra/gte/tegra194_gte.c
+++ b/drivers/staging/platform/tegra/gte/tegra194_gte.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2022, NVIDIA CORPORATION & AFFILIATES.All rights reserved.
+ * Copyright (c) 2020-2023, NVIDIA CORPORATION & AFFILIATES.All rights reserved.
  *
  * SPDX-License-Identifier: GPL-2.0
  */
@@ -311,9 +311,9 @@ static ssize_t show_num_events_avail(struct kobject *kobj,
 	return scnprintf(buf, PAGE_SIZE, "%d\n", atomic_read(&ev->usage));
 }
 
-struct kobj_attribute num_events_avail_attr =
+static struct kobj_attribute num_events_avail_attr =
 	__ATTR(num_events_avail, 0400, show_num_events_avail, NULL);
-struct kobj_attribute num_dropped_events_attr =
+static struct kobj_attribute num_dropped_events_attr =
 	__ATTR(num_dropped_events, 0400, show_num_dropped_events, NULL);
 
 static struct attribute *ev_attrs[] = {
@@ -674,11 +674,11 @@ struct gte_uspace_event_state {
 	struct tegra_gte_ev_desc *gte_data;
 };
 
-static unsigned int gte_event_poll(struct file *filep,
-				   struct poll_table_struct *wait)
+static __poll_t gte_event_poll(struct file *filep,
+			       struct poll_table_struct *wait)
 {
 	struct gte_uspace_event_state *le = filep->private_data;
-	unsigned int events = 0;
+	__poll_t events = 0;
 
 	poll_wait(filep, &le->wait, wait);
 
diff --git a/drivers/staging/platform/tegra/gte_test/tegra194_gte_test.c b/drivers/staging/platform/tegra/gte_test/tegra194_gte_test.c
index 0c98cbca..89b2d41a 100644
--- a/drivers/staging/platform/tegra/gte_test/tegra194_gte_test.c
+++ b/drivers/staging/platform/tegra/gte_test/tegra194_gte_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2022, NVIDIA CORPORATION & AFFILIATES.All rights reserved.
+ * Copyright (c) 2020-2023, NVIDIA CORPORATION & AFFILIATES.All rights reserved.
  *
  * SPDX-License-Identifier: GPL-2.0
  */
@@ -193,11 +193,11 @@ static ssize_t show_lic_irq_ts(struct kobject *kobj,
 			 hts.ts_raw, hts.ts_ns);
 }
 
-struct kobj_attribute gpio_en_dis_attr =
+static struct kobj_attribute gpio_en_dis_attr =
 		__ATTR(gpio_en_dis, 0220, NULL, store_gpio_en_dis);
-struct kobj_attribute lic_irq_en_dis_attr =
+static struct kobj_attribute lic_irq_en_dis_attr =
 		__ATTR(lic_irq_en_dis, 0220, NULL, store_lic_irq_en_dis);
-struct kobj_attribute lic_irq_ts_attr =
+static struct kobj_attribute lic_irq_ts_attr =
 		__ATTR(lic_irq_ts, 0440, show_lic_irq_ts, NULL);
 
 static struct attribute *attrs[] = {