staging: gpib: Removing typedef gpib_status_queue

Removing gpib_status_queue_t to adhere to Linux code style.

Reported by checkpatch.pl

In general, a pointer, or a struct that has elements that can reasonably be
directly accessed should never be a typedef.

Signed-off-by: Michael Rubin <matchstick@neverthere.org>
Link: https://lore.kernel.org/r/20250408232535.187528-5-matchstick@neverthere.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/gpib/common/gpib_os.c b/drivers/staging/gpib/common/gpib_os.c
index f823c261b393d15c960205492f920bbf77b29ef7..1804faa6395f4ada04da51433419b4f300b1fe51 100644 (file)
--- a/drivers/staging/gpib/common/gpib_os.c
+++ b/drivers/staging/gpib/common/gpib_os.c
@@ -172,7 +172,7 @@ EXPORT_SYMBOL(gpib_free_pseudo_irq);
 
 static const unsigned int serial_timeout = 1000000;
 
-unsigned int num_status_bytes(const gpib_status_queue_t *dev)
+unsigned int num_status_bytes(const struct gpib_status_queue *dev)
 {
        if (!dev)
                return 0;
@@ -180,7 +180,7 @@ unsigned int num_status_bytes(const gpib_status_queue_t *dev)
 }
 
 // push status byte onto back of status byte fifo
-int push_status_byte(struct gpib_board *board, gpib_status_queue_t *device, u8 poll_byte)
+int push_status_byte(struct gpib_board *board, struct gpib_status_queue *device, u8 poll_byte)
 {
        struct list_head *head = &device->status_bytes;
        status_byte_t *status;
@@ -214,7 +214,7 @@ int push_status_byte(struct gpib_board *board, gpib_status_queue_t *device, u8 p
 }
 
 // pop status byte from front of status byte fifo
-int pop_status_byte(struct gpib_board *board, gpib_status_queue_t *device, u8 *poll_byte)
+int pop_status_byte(struct gpib_board *board, struct gpib_status_queue *device, u8 *poll_byte)
 {
        struct list_head *head = &device->status_bytes;
        struct list_head *front = head->next;
@@ -245,14 +245,14 @@ int pop_status_byte(struct gpib_board *board, gpib_status_queue_t *device, u8 *p
        return 0;
 }
 
-gpib_status_queue_t *get_gpib_status_queue(struct gpib_board *board, unsigned int pad, int sad)
+struct gpib_status_queue *get_gpib_status_queue(struct gpib_board *board, unsigned int pad, int sad)
 {
-       gpib_status_queue_t *device;
+       struct gpib_status_queue *device;
        struct list_head *list_ptr;
        const struct list_head *head = &board->device_list;
 
        for (list_ptr = head->next; list_ptr != head; list_ptr = list_ptr->next) {
-               device = list_entry(list_ptr, gpib_status_queue_t, list);
+               device = list_entry(list_ptr, struct gpib_status_queue, list);
                if (gpib_address_equal(device->pad, device->sad, pad, sad))
                        return device;
        }
@@ -263,7 +263,7 @@ gpib_status_queue_t *get_gpib_status_queue(struct gpib_board *board, unsigned in
 int get_serial_poll_byte(struct gpib_board *board, unsigned int pad, int sad,
                         unsigned int usec_timeout, uint8_t *poll_byte)
 {
-       gpib_status_queue_t *device;
+       struct gpib_status_queue *device;
 
        device = get_gpib_status_queue(board, pad, sad);
        if (num_status_bytes(device))
@@ -429,7 +429,7 @@ int serial_poll_all(struct gpib_board *board, unsigned int usec_timeout)
        int retval = 0;
        struct list_head *cur;
        const struct list_head *head = NULL;
-       gpib_status_queue_t *device;
+       struct gpib_status_queue *device;
        u8 result;
        unsigned int num_bytes = 0;
 
@@ -442,7 +442,7 @@ int serial_poll_all(struct gpib_board *board, unsigned int usec_timeout)
                return retval;
 
        for (cur = head->next; cur != head; cur = cur->next) {
-               device = list_entry(cur, gpib_status_queue_t, list);
+               device = list_entry(cur, struct gpib_status_queue, list);
                retval = read_serial_poll_byte(board,
                                               device->pad, device->sad, usec_timeout, &result);
                if (retval < 0)
@@ -1092,7 +1092,7 @@ static int write_ioctl(gpib_file_private_t *file_priv, struct gpib_board *board,
 
 static int status_bytes_ioctl(struct gpib_board *board, unsigned long arg)
 {
-       gpib_status_queue_t *device;
+       struct gpib_status_queue *device;
        spoll_bytes_ioctl_t cmd;
        int retval;
 
@@ -1117,13 +1117,13 @@ static int increment_open_device_count(struct gpib_board *board, struct list_hea
                                       unsigned int pad, int sad)
 {
        struct list_head *list_ptr;
-       gpib_status_queue_t *device;
+       struct gpib_status_queue *device;
 
        /* first see if address has already been opened, then increment
         * open count
         */
        for (list_ptr = head->next; list_ptr != head; list_ptr = list_ptr->next) {
-               device = list_entry(list_ptr, gpib_status_queue_t, list);
+               device = list_entry(list_ptr, struct gpib_status_queue, list);
                if (gpib_address_equal(device->pad, device->sad, pad, sad)) {
                        dev_dbg(board->gpib_dev, "incrementing open count for pad %i, sad %i\n",
                                device->pad, device->sad);
@@ -1132,8 +1132,8 @@ static int increment_open_device_count(struct gpib_board *board, struct list_hea
                }
        }
 
-       /* otherwise we need to allocate a new gpib_status_queue_t */
-       device = kmalloc(sizeof(gpib_status_queue_t), GFP_ATOMIC);
+       /* otherwise we need to allocate a new struct gpib_status_queue */
+       device = kmalloc(sizeof(struct gpib_status_queue), GFP_ATOMIC);
        if (!device)
                return -ENOMEM;
        init_gpib_status_queue(device);
@@ -1151,11 +1151,11 @@ static int increment_open_device_count(struct gpib_board *board, struct list_hea
 static int subtract_open_device_count(struct gpib_board *board, struct list_head *head,
                                      unsigned int pad, int sad, unsigned int count)
 {
-       gpib_status_queue_t *device;
+       struct gpib_status_queue *device;
        struct list_head *list_ptr;
 
        for (list_ptr = head->next; list_ptr != head; list_ptr = list_ptr->next) {
-               device = list_entry(list_ptr, gpib_status_queue_t, list);
+               device = list_entry(list_ptr, struct gpib_status_queue, list);
                if (gpib_address_equal(device->pad, device->sad, pad, sad)) {
                        dev_dbg(board->gpib_dev, "decrementing open count for pad %i, sad %i\n",
                                device->pad, device->sad);
@@ -2147,7 +2147,7 @@ static void init_board_array(struct gpib_board *board_array, unsigned int length
        }
 }
 
-void init_gpib_status_queue(gpib_status_queue_t *device)
+void init_gpib_status_queue(struct gpib_status_queue *device)
 {
        INIT_LIST_HEAD(&device->list);
        INIT_LIST_HEAD(&device->status_bytes);

diff --git a/drivers/staging/gpib/common/iblib.c b/drivers/staging/gpib/common/iblib.c
index b297261818f2120d6c7f04bc6e08168f40337653..718df9683e7acad883000ec60c6b7803ba1a1fa7 100644 (file)
--- a/drivers/staging/gpib/common/iblib.c
+++ b/drivers/staging/gpib/common/iblib.c
@@ -506,7 +506,7 @@ int ibstatus(struct gpib_board *board)
        return general_ibstatus(board, NULL, 0, 0, NULL);
 }
 
-int general_ibstatus(struct gpib_board *board, const gpib_status_queue_t *device,
+int general_ibstatus(struct gpib_board *board, const struct gpib_status_queue *device,
                     int clear_mask, int set_mask, gpib_descriptor_t *desc)
 {
        int status = 0;
@@ -573,7 +573,7 @@ static void init_wait_info(struct wait_info *winfo)
        timer_setup_on_stack(&winfo->timer, wait_timeout, 0);
 }
 
-static int wait_satisfied(struct wait_info *winfo, gpib_status_queue_t *status_queue,
+static int wait_satisfied(struct wait_info *winfo, struct gpib_status_queue *status_queue,
                          int wait_mask, int *status, gpib_descriptor_t *desc)
 {
        struct gpib_board *board = winfo->board;
@@ -626,7 +626,7 @@ int ibwait(struct gpib_board *board, int wait_mask, int clear_mask, int set_mask
           int *status, unsigned long usec_timeout, gpib_descriptor_t *desc)
 {
        int retval = 0;
-       gpib_status_queue_t *status_queue;
+       struct gpib_status_queue *status_queue;
        struct wait_info winfo;
 
        if (desc->is_board)

diff --git a/drivers/staging/gpib/common/ibsys.h b/drivers/staging/gpib/common/ibsys.h
index 19960af809c2e81f0e7d19a3551c67de3b37f5bc..a9fdf95cfa96cde9558dfce4b784a1e9195da974 100644 (file)
--- a/drivers/staging/gpib/common/ibsys.h
+++ b/drivers/staging/gpib/common/ibsys.h
@@ -22,10 +22,13 @@
 int gpib_allocate_board(struct gpib_board *board);
 void gpib_deallocate_board(struct gpib_board *board);
 
-unsigned int num_status_bytes(const gpib_status_queue_t *dev);
-int push_status_byte(struct gpib_board *board, gpib_status_queue_t *device, uint8_t poll_byte);
-int pop_status_byte(struct gpib_board *board, gpib_status_queue_t *device, uint8_t *poll_byte);
-gpib_status_queue_t *get_gpib_status_queue(struct gpib_board *board, unsigned int pad, int sad);
+unsigned int num_status_bytes(const struct gpib_status_queue *dev);
+int push_status_byte(struct gpib_board *board, struct gpib_status_queue *device,
+                    uint8_t poll_byte);
+int pop_status_byte(struct gpib_board *board, struct gpib_status_queue *device,
+                   uint8_t *poll_byte);
+struct gpib_status_queue *get_gpib_status_queue(struct gpib_board *board,
+                                               unsigned int pad, int sad);
 int get_serial_poll_byte(struct gpib_board *board, unsigned int pad, int sad,
                         unsigned int usec_timeout, uint8_t *poll_byte);
 int autopoll_all_devices(struct gpib_board *board);

diff --git a/drivers/staging/gpib/include/gpib_proto.h b/drivers/staging/gpib/include/gpib_proto.h
index 6da24eb11b3591b3fba21d6b977948eb0a2ecf67..7e890a1d45523ba9a9def2c4c20870033094fcbd 100644 (file)
--- a/drivers/staging/gpib/include/gpib_proto.h
+++ b/drivers/staging/gpib/include/gpib_proto.h
@@ -41,7 +41,7 @@ int ibwait(struct gpib_board *board, int wait_mask, int clear_mask, int set_mask
           int *status, unsigned long usec_timeout, gpib_descriptor_t *desc);
 int ibwrt(struct gpib_board *board, uint8_t *buf, size_t cnt, int send_eoi, size_t *bytes_written);
 int ibstatus(struct gpib_board *board);
-int general_ibstatus(struct gpib_board *board, const gpib_status_queue_t *device,
+int general_ibstatus(struct gpib_board *board, const struct gpib_status_queue *device,
                     int clear_mask, int set_mask, gpib_descriptor_t *desc);
 int io_timed_out(struct gpib_board *board);
 int ibppc(struct gpib_board *board, uint8_t configuration);

diff --git a/drivers/staging/gpib/include/gpib_types.h b/drivers/staging/gpib/include/gpib_types.h
index e45e784ff8e97b70e73268eec5097df0b96181ec..3be51ee98ef176d32adcdd6a8279f76572ac8eee 100644 (file)
--- a/drivers/staging/gpib/include/gpib_types.h
+++ b/drivers/staging/gpib/include/gpib_types.h
@@ -308,10 +308,10 @@ struct gpib_event {
        short event_type;
 };
 
-/* Each board has a list of gpib_status_queue_t to keep track of all open devices
+/* Each board has a list of gpib_status_queue to keep track of all open devices
  * on the bus, so we know what address to poll when we get a service request
  */
-typedef struct {
+struct gpib_status_queue {
        /* list_head so we can make a linked list of devices */
        struct list_head list;
        unsigned int pad;       /* primary gpib address */
@@ -323,14 +323,14 @@ typedef struct {
        unsigned int reference_count;
        /* flags loss of status byte error due to limit on size of queue */
        unsigned dropped_byte : 1;
-} gpib_status_queue_t;
+};
 
 typedef struct {
        struct list_head list;
        u8 poll_byte;
 } status_byte_t;
 
-void init_gpib_status_queue(gpib_status_queue_t *device);
+void init_gpib_status_queue(struct gpib_status_queue *device);
 
 /* Used to store device-descriptor-specific information */
 typedef struct {