[PATCH] staging: media: atomisp: remove ia_css_circbuf_t typedef
From: Rareș-Mihai Vladu
Date: Fri Sep 18 2026 - 17:42:04 EST
Remove typedef ia_css_circbuf_t and use struct ia_css_circbuf_s
directly, as per kernel coding style (chapter 5).
Signed-off-by: Rareș-Mihai Vladu <vladurares@xxxxxxxxx>
---
.../base/circbuf/interface/ia_css_circbuf.h | 37 +++++++++----------
.../atomisp/pci/base/circbuf/src/circbuf.c | 28 +++++++-------
.../pci/runtime/queue/src/queue_access.h | 2 +-
3 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf.h b/drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf.h
index fbcd73b71..de49bf9cd 100644
--- a/drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf.h
+++ b/drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf.h
@@ -23,7 +23,6 @@
/*
* @brief Data structure for the circular buffer.
*/
-typedef struct ia_css_circbuf_s ia_css_circbuf_t;
struct ia_css_circbuf_s {
ia_css_circbuf_desc_t *desc; /* Pointer to the descriptor of the circbuf */
ia_css_circbuf_elem_t *elems; /* an array of elements */
@@ -37,7 +36,7 @@ struct ia_css_circbuf_s {
* @param desc The descriptor set to the size using ia_css_circbuf_desc_init().
*/
void ia_css_circbuf_create(
- ia_css_circbuf_t *cb,
+ struct ia_css_circbuf_s *cb,
ia_css_circbuf_elem_t *elems,
ia_css_circbuf_desc_t *desc);
@@ -47,7 +46,7 @@ void ia_css_circbuf_create(
* @param cb The pointer to the circular buffer.
*/
void ia_css_circbuf_destroy(
- ia_css_circbuf_t *cb);
+ struct ia_css_circbuf_s *cb);
/*
* @brief Pop a value out of the circular buffer.
@@ -60,7 +59,7 @@ void ia_css_circbuf_destroy(
* @return the pop-out value.
*/
uint32_t ia_css_circbuf_pop(
- ia_css_circbuf_t *cb);
+ struct ia_css_circbuf_s *cb);
/*
* @brief Extract a value out of the circular buffer.
@@ -74,7 +73,7 @@ uint32_t ia_css_circbuf_pop(
* @return the extracted value.
*/
uint32_t ia_css_circbuf_extract(
- ia_css_circbuf_t *cb,
+ struct ia_css_circbuf_s *cb,
int offset);
/****************************************************************
@@ -135,7 +134,7 @@ static inline void ia_css_circbuf_elem_cpy(
* @return the position at offset.
*/
static inline uint8_t ia_css_circbuf_get_pos_at_offset(
- ia_css_circbuf_t *cb,
+ struct ia_css_circbuf_s *cb,
u32 base,
int offset)
{
@@ -163,7 +162,7 @@ static inline uint8_t ia_css_circbuf_get_pos_at_offset(
* @return the offset.
*/
static inline int ia_css_circbuf_get_offset(
- ia_css_circbuf_t *cb,
+ struct ia_css_circbuf_s *cb,
u32 src_pos,
uint32_t dest_pos)
{
@@ -188,7 +187,7 @@ static inline int ia_css_circbuf_get_offset(
* TODO: Test this API.
*/
static inline uint32_t ia_css_circbuf_get_size(
- ia_css_circbuf_t *cb)
+ struct ia_css_circbuf_s *cb)
{
OP___assert(cb);
OP___assert(cb->desc);
@@ -204,7 +203,7 @@ static inline uint32_t ia_css_circbuf_get_size(
* @return the number of available elements.
*/
static inline uint32_t ia_css_circbuf_get_num_elems(
- ia_css_circbuf_t *cb)
+ struct ia_css_circbuf_s *cb)
{
int num;
@@ -226,7 +225,7 @@ static inline uint32_t ia_css_circbuf_get_num_elems(
* - false when it is not empty.
*/
static inline bool ia_css_circbuf_is_empty(
- ia_css_circbuf_t *cb)
+ struct ia_css_circbuf_s *cb)
{
OP___assert(cb);
OP___assert(cb->desc);
@@ -243,7 +242,7 @@ static inline bool ia_css_circbuf_is_empty(
* - true when it is full.
* - false when it is not full.
*/
-static inline bool ia_css_circbuf_is_full(ia_css_circbuf_t *cb)
+static inline bool ia_css_circbuf_is_full(struct ia_css_circbuf_s *cb)
{
OP___assert(cb);
OP___assert(cb->desc);
@@ -261,7 +260,7 @@ static inline bool ia_css_circbuf_is_full(ia_css_circbuf_t *cb)
* @param elem The new element.
*/
static inline void ia_css_circbuf_write(
- ia_css_circbuf_t *cb,
+ struct ia_css_circbuf_s *cb,
ia_css_circbuf_elem_t elem)
{
OP___assert(cb);
@@ -285,7 +284,7 @@ static inline void ia_css_circbuf_write(
* @param val The value to be pushed in.
*/
static inline void ia_css_circbuf_push(
- ia_css_circbuf_t *cb,
+ struct ia_css_circbuf_s *cb,
uint32_t val)
{
ia_css_circbuf_elem_t elem;
@@ -308,7 +307,7 @@ static inline void ia_css_circbuf_push(
* @return: The number of free elements.
*/
static inline uint32_t ia_css_circbuf_get_free_elems(
- ia_css_circbuf_t *cb)
+ struct ia_css_circbuf_s *cb)
{
OP___assert(cb);
OP___assert(cb->desc);
@@ -320,24 +319,24 @@ static inline uint32_t ia_css_circbuf_get_free_elems(
* @brief Peek an element in Circular Buffer.
*
* @param cb The pointer to the circular buffer.
- * @param offset Offset to the element.
+ * @param offset to the element.
*
* @return the elements value.
*/
uint32_t ia_css_circbuf_peek(
- ia_css_circbuf_t *cb,
+ struct ia_css_circbuf_s *cb,
int offset);
/*
* @brief Get an element in Circular Buffer.
*
* @param cb The pointer to the circular buffer.
- * @param offset Offset to the element.
+ * @param offset to the element.
*
* @return the elements value.
*/
uint32_t ia_css_circbuf_peek_from_start(
- ia_css_circbuf_t *cb,
+ struct ia_css_circbuf_s *cb,
int offset);
/*
@@ -356,7 +355,7 @@ uint32_t ia_css_circbuf_peek_from_start(
* false on failure
*/
bool ia_css_circbuf_increase_size(
- ia_css_circbuf_t *cb,
+ struct ia_css_circbuf_s *cb,
unsigned int sz_delta,
ia_css_circbuf_elem_t *elems);
diff --git a/drivers/staging/media/atomisp/pci/base/circbuf/src/circbuf.c b/drivers/staging/media/atomisp/pci/base/circbuf/src/circbuf.c
index cb34d0b5a..203856e24 100644
--- a/drivers/staging/media/atomisp/pci/base/circbuf/src/circbuf.c
+++ b/drivers/staging/media/atomisp/pci/base/circbuf/src/circbuf.c
@@ -24,7 +24,7 @@
* @return the oldest element.
*/
static inline ia_css_circbuf_elem_t
-ia_css_circbuf_read(ia_css_circbuf_t *cb);
+ia_css_circbuf_read(struct ia_css_circbuf_s *cb);
/*
* @brief Shift a chunk of elements in the circular buffer.
@@ -36,8 +36,8 @@ ia_css_circbuf_read(ia_css_circbuf_t *cb);
* @param chunk_src The position at which the first element in the chunk is.
* @param chunk_dest The position to which the first element in the chunk would be shift.
*/
-static inline void ia_css_circbuf_shift_chunk(ia_css_circbuf_t *cb,
- u32 chunk_src,
+static inline void ia_css_circbuf_shift_chunk(struct ia_css_circbuf_s *cb,
+ u32 chunk_src,
uint32_t chunk_dest);
/*
@@ -60,7 +60,7 @@ ia_css_circbuf_elem_get_val(ia_css_circbuf_elem_t *elem);
* Refer to "ia_css_circbuf.h" for details.
*/
void
-ia_css_circbuf_create(ia_css_circbuf_t *cb,
+ia_css_circbuf_create(struct ia_css_circbuf_s *cb,
ia_css_circbuf_elem_t *elems,
ia_css_circbuf_desc_t *desc)
{
@@ -84,7 +84,7 @@ ia_css_circbuf_create(ia_css_circbuf_t *cb,
* @brief Destroy the circular buffer.
* Refer to "ia_css_circbuf.h" for details.
*/
-void ia_css_circbuf_destroy(ia_css_circbuf_t *cb)
+void ia_css_circbuf_destroy(struct ia_css_circbuf_s *cb)
{
cb->desc = NULL;
@@ -95,7 +95,7 @@ void ia_css_circbuf_destroy(ia_css_circbuf_t *cb)
* @brief Pop a value out of the circular buffer.
* Refer to "ia_css_circbuf.h" for details.
*/
-uint32_t ia_css_circbuf_pop(ia_css_circbuf_t *cb)
+uint32_t ia_css_circbuf_pop(struct ia_css_circbuf_s *cb)
{
u32 ret;
ia_css_circbuf_elem_t elem;
@@ -112,7 +112,7 @@ uint32_t ia_css_circbuf_pop(ia_css_circbuf_t *cb)
* @brief Extract a value out of the circular buffer.
* Refer to "ia_css_circbuf.h" for details.
*/
-uint32_t ia_css_circbuf_extract(ia_css_circbuf_t *cb, int offset)
+uint32_t ia_css_circbuf_extract(struct ia_css_circbuf_s *cb, int offset)
{
int max_offset;
u32 val;
@@ -162,7 +162,7 @@ uint32_t ia_css_circbuf_extract(ia_css_circbuf_t *cb, int offset)
* @brief Peek an element from the circular buffer.
* Refer to "ia_css_circbuf.h" for details.
*/
-uint32_t ia_css_circbuf_peek(ia_css_circbuf_t *cb, int offset)
+uint32_t ia_css_circbuf_peek(struct ia_css_circbuf_s *cb, int offset)
{
int pos;
@@ -176,7 +176,7 @@ uint32_t ia_css_circbuf_peek(ia_css_circbuf_t *cb, int offset)
* @brief Get the value of an element from the circular buffer.
* Refer to "ia_css_circbuf.h" for details.
*/
-uint32_t ia_css_circbuf_peek_from_start(ia_css_circbuf_t *cb, int offset)
+uint32_t ia_css_circbuf_peek_from_start(struct ia_css_circbuf_s *cb, int offset)
{
int pos;
@@ -192,7 +192,7 @@ uint32_t ia_css_circbuf_peek_from_start(ia_css_circbuf_t *cb, int offset)
* Please refer to "ia_css_circbuf.h" for details.
*/
bool ia_css_circbuf_increase_size(
- ia_css_circbuf_t *cb,
+ struct ia_css_circbuf_s *cb,
unsigned int sz_delta,
ia_css_circbuf_elem_t *elems)
{
@@ -260,7 +260,7 @@ ia_css_circbuf_elem_get_val(ia_css_circbuf_elem_t *elem)
* Refer to "Forward declarations" for details.
*/
static inline ia_css_circbuf_elem_t
-ia_css_circbuf_read(ia_css_circbuf_t *cb)
+ia_css_circbuf_read(struct ia_css_circbuf_s *cb)
{
ia_css_circbuf_elem_t elem;
@@ -280,7 +280,7 @@ ia_css_circbuf_read(ia_css_circbuf_t *cb)
* Refer to "Forward declarations" for details.
*/
static inline void
-ia_css_circbuf_shift_chunk(ia_css_circbuf_t *cb,
+ia_css_circbuf_shift_chunk(struct ia_css_circbuf_s *cb,
u32 chunk_src, uint32_t chunk_dest)
{
int chunk_offset;
@@ -289,7 +289,7 @@ ia_css_circbuf_shift_chunk(ia_css_circbuf_t *cb,
/* get the chunk offset and size */
chunk_offset = ia_css_circbuf_get_offset(cb,
- chunk_src, chunk_dest);
+ chunk_src, chunk_dest);
chunk_sz = ia_css_circbuf_get_offset(cb, cb->desc->start, chunk_src) + 1;
/* shift each element to its terminal position */
@@ -308,5 +308,5 @@ ia_css_circbuf_shift_chunk(ia_css_circbuf_t *cb,
/* adjust the index "start" */
cb->desc->start = ia_css_circbuf_get_pos_at_offset(cb, cb->desc->start,
- chunk_offset);
+ chunk_offset);
}
diff --git a/drivers/staging/media/atomisp/pci/runtime/queue/src/queue_access.h b/drivers/staging/media/atomisp/pci/runtime/queue/src/queue_access.h
index d62133a8f..d9b76b70d 100644
--- a/drivers/staging/media/atomisp/pci/runtime/queue/src/queue_access.h
+++ b/drivers/staging/media/atomisp/pci/runtime/queue/src/queue_access.h
@@ -47,7 +47,7 @@ struct ia_css_queue {
u8 location; /* Cell location for queue */
u8 proc_id; /* Processor id for queue access */
union {
- ia_css_circbuf_t cb_local;
+ struct ia_css_circbuf_s cb_local;
struct {
u32 cb_desc_addr; /*Circbuf desc address for remote queues*/
u32 cb_elems_addr; /*Circbuf elements addr for remote queue*/
--
2.43.0