From a04a2ca76cdc441f6510033b26ce6fd7fafcb1e1 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <npitre@baylibre.com>
Date: Mon, 20 May 2019 23:02:39 -0400
Subject: [PATCH] k_fifo/K_lifo macros: avoid unnecessary casts

The fifo/lifo API is implemented on top of the queue API with macros
that blindly force a cast to struct k_queue. Providing a reference to
the _queue member from the k_fifo structure is much cleaner as it let
the compiler perform pointer type checking. Generated code is identical.

Signed-off-by: Nicolas Pitre <npitre@baylibre.com>
---
 include/kernel.h | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/kernel.h b/include/kernel.h
index fdd904abb64..676c47820c2 100644
--- a/include/kernel.h
+++ b/include/kernel.h
@@ -2091,7 +2091,7 @@ struct k_fifo {
  * @req K-FIFO-001
  */
 #define k_fifo_init(fifo) \
-	k_queue_init((struct k_queue *) fifo)
+	k_queue_init(&(fifo)->_queue)
 
 /**
  * @brief Cancel waiting on a FIFO queue.
@@ -2108,7 +2108,7 @@ struct k_fifo {
  * @req K-FIFO-001
  */
 #define k_fifo_cancel_wait(fifo) \
-	k_queue_cancel_wait((struct k_queue *) fifo)
+	k_queue_cancel_wait(&(fifo)->_queue)
 
 /**
  * @brief Add an element to a FIFO queue.
@@ -2126,7 +2126,7 @@ struct k_fifo {
  * @req K-FIFO-001
  */
 #define k_fifo_put(fifo, data) \
-	k_queue_append((struct k_queue *) fifo, data)
+	k_queue_append(&(fifo)->_queue, data)
 
 /**
  * @brief Add an element to a FIFO queue.
@@ -2146,7 +2146,7 @@ struct k_fifo {
  * @req K-FIFO-001
  */
 #define k_fifo_alloc_put(fifo, data) \
-	k_queue_alloc_append((struct k_queue *) fifo, data)
+	k_queue_alloc_append(&(fifo)->_queue, data)
 
 /**
  * @brief Atomically add a list of elements to a FIFO.
@@ -2166,7 +2166,7 @@ struct k_fifo {
  * @req K-FIFO-001
  */
 #define k_fifo_put_list(fifo, head, tail) \
-	k_queue_append_list((struct k_queue *) fifo, head, tail)
+	k_queue_append_list(&(fifo)->_queue, head, tail)
 
 /**
  * @brief Atomically add a list of elements to a FIFO queue.
@@ -2185,7 +2185,7 @@ struct k_fifo {
  * @req K-FIFO-001
  */
 #define k_fifo_put_slist(fifo, list) \
-	k_queue_merge_slist((struct k_queue *) fifo, list)
+	k_queue_merge_slist(&(fifo)->_queue, list)
 
 /**
  * @brief Get an element from a FIFO queue.
@@ -2204,7 +2204,7 @@ struct k_fifo {
  * @req K-FIFO-001
  */
 #define k_fifo_get(fifo, timeout) \
-	k_queue_get((struct k_queue *) fifo, timeout)
+	k_queue_get(&(fifo)->_queue, timeout)
 
 /**
  * @brief Query a FIFO queue to see if it has data available.
@@ -2221,7 +2221,7 @@ struct k_fifo {
  * @req K-FIFO-001
  */
 #define k_fifo_is_empty(fifo) \
-	k_queue_is_empty((struct k_queue *) fifo)
+	k_queue_is_empty(&(fifo)->_queue)
 
 /**
  * @brief Peek element at the head of a FIFO queue.
@@ -2238,7 +2238,7 @@ struct k_fifo {
  * @req K-FIFO-001
  */
 #define k_fifo_peek_head(fifo) \
-	k_queue_peek_head((struct k_queue *) fifo)
+	k_queue_peek_head(&(fifo)->_queue)
 
 /**
  * @brief Peek element at the tail of FIFO queue.
@@ -2253,7 +2253,7 @@ struct k_fifo {
  * @req K-FIFO-001
  */
 #define k_fifo_peek_tail(fifo) \
-	k_queue_peek_tail((struct k_queue *) fifo)
+	k_queue_peek_tail(&(fifo)->_queue)
 
 /**
  * @brief Statically define and initialize a FIFO queue.
@@ -2308,7 +2308,7 @@ struct k_lifo {
  * @req K-LIFO-001
  */
 #define k_lifo_init(lifo) \
-	k_queue_init((struct k_queue *) lifo)
+	k_queue_init(&(lifo)->_queue)
 
 /**
  * @brief Add an element to a LIFO queue.
@@ -2326,7 +2326,7 @@ struct k_lifo {
  * @req K-LIFO-001
  */
 #define k_lifo_put(lifo, data) \
-	k_queue_prepend((struct k_queue *) lifo, data)
+	k_queue_prepend(&(lifo)->_queue, data)
 
 /**
  * @brief Add an element to a LIFO queue.
@@ -2346,7 +2346,7 @@ struct k_lifo {
  * @req K-LIFO-001
  */
 #define k_lifo_alloc_put(lifo, data) \
-	k_queue_alloc_prepend((struct k_queue *) lifo, data)
+	k_queue_alloc_prepend(&(lifo)->_queue, data)
 
 /**
  * @brief Get an element from a LIFO queue.
@@ -2365,7 +2365,7 @@ struct k_lifo {
  * @req K-LIFO-001
  */
 #define k_lifo_get(lifo, timeout) \
-	k_queue_get((struct k_queue *) lifo, timeout)
+	k_queue_get(&(lifo)->_queue, timeout)
 
 /**
  * @brief Statically define and initialize a LIFO queue.