From 202adf565f3ab5561374cfe1e9df123fb2a466f1 Mon Sep 17 00:00:00 2001
From: Andy Ross <andrew.j.ross@intel.com>
Date: Tue, 10 Nov 2020 09:54:49 -0800
Subject: [PATCH] kernel: Rename struct _poller

This legacy struct still had a non-standard name.  Clean it up to
conform to currrent naming guidelines.

Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
---
 include/kernel.h |  8 ++++----
 kernel/poll.c    | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/kernel.h b/include/kernel.h
index f9533bbebf3..a7ae21d936a 100644
--- a/include/kernel.h
+++ b/include/kernel.h
@@ -275,7 +275,7 @@ struct _thread_userspace_local_data {
 /* private, used by k_poll and k_work_poll */
 struct k_work_poll;
 typedef int (*_poller_cb_t)(struct k_poll_event *event, uint32_t state);
-struct _poller {
+struct z_poller {
 	bool is_polling;
 	uint8_t mode;
 };
@@ -318,7 +318,7 @@ struct k_thread {
 	void (*fn_abort)(struct k_thread *aborted);
 
 #if defined(CONFIG_POLL)
-	struct _poller poller;
+	struct z_poller poller;
 #endif
 
 #if defined(CONFIG_THREAD_MONITOR)
@@ -2769,7 +2769,7 @@ struct k_delayed_work {
 struct k_work_poll {
 	struct k_work work;
 	struct k_work_q *workq;
-	struct _poller poller;
+	struct z_poller poller;
 	struct k_poll_event *events;
 	int num_events;
 	k_work_handler_t real_handler;
@@ -4710,7 +4710,7 @@ struct k_poll_event {
 	sys_dnode_t _node;
 
 	/** PRIVATE - DO NOT TOUCH */
-	struct _poller *poller;
+	struct z_poller *poller;
 
 	/** optional user-specified tag, opaque, untouched by the API */
 	uint32_t tag:8;
diff --git a/kernel/poll.c b/kernel/poll.c
index e3ba32b197e..d30e9362a9a 100644
--- a/kernel/poll.c
+++ b/kernel/poll.c
@@ -88,13 +88,13 @@ static inline bool is_condition_met(struct k_poll_event *event, uint32_t *state)
 	return false;
 }
 
-static struct k_thread *poller_thread(struct _poller *p)
+static struct k_thread *poller_thread(struct z_poller *p)
 {
 	return p ? CONTAINER_OF(p, struct k_thread, poller) : NULL;
 }
 
 static inline void add_event(sys_dlist_t *events, struct k_poll_event *event,
-			     struct _poller *poller)
+			     struct z_poller *poller)
 {
 	struct k_poll_event *pending;
 
@@ -119,7 +119,7 @@ static inline void add_event(sys_dlist_t *events, struct k_poll_event *event,
 
 /* must be called with interrupts locked */
 static inline int register_event(struct k_poll_event *event,
-				 struct _poller *poller)
+				 struct z_poller *poller)
 {
 	switch (event->type) {
 	case K_POLL_TYPE_SEM_AVAILABLE:
@@ -199,7 +199,7 @@ static inline void set_event_ready(struct k_poll_event *event, uint32_t state)
 
 static inline int register_events(struct k_poll_event *events,
 				  int num_events,
-				  struct _poller *poller,
+				  struct z_poller *poller,
 				  bool just_check)
 {
 	int events_registered = 0;
@@ -258,7 +258,7 @@ int z_impl_k_poll(struct k_poll_event *events, int num_events,
 {
 	int events_registered;
 	k_spinlock_key_t key;
-	struct _poller *poller = &_current->poller;
+	struct z_poller *poller = &_current->poller;
 
 	poller->is_polling = true;
 	poller->mode = MODE_POLL;
@@ -390,7 +390,7 @@ oops_free:
 /* must be called with interrupts locked */
 static int signal_poll_event(struct k_poll_event *event, uint32_t state)
 {
-	struct _poller *poller = event->poller;
+	struct z_poller *poller = event->poller;
 	int retcode = 0;
 
 	if (poller) {
@@ -530,7 +530,7 @@ static void triggered_work_expiration_handler(struct _timeout *timeout)
 
 static int signal_triggered_work(struct k_poll_event *event, uint32_t status)
 {
-	struct _poller *poller = event->poller;
+	struct z_poller *poller = event->poller;
 	struct k_work_poll *twork =
 		CONTAINER_OF(poller, struct k_work_poll, poller);