staging: gpib: Removing typedef gpib_descriptor_t

Removing gpib_descriptor_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-7-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 9c943cbea984c58dace4aed7ef564c10161d60b6..0e93dcbf8e2e424b93b960f7152d82dbf9f9a8d9 100644 (file)
--- a/drivers/staging/gpib/common/gpib_os.c
+++ b/drivers/staging/gpib/common/gpib_os.c
@@ -494,7 +494,7 @@ int dvrsp(struct gpib_board *board, unsigned int pad, int sad,
        return retval;
 }
 
-static gpib_descriptor_t *handle_to_descriptor(const gpib_file_private_t *file_priv,
+static struct gpib_descriptor *handle_to_descriptor(const gpib_file_private_t *file_priv,
                                               int handle)
 {
        if (handle < 0 || handle >= GPIB_MAX_NUM_DESCRIPTORS) {
@@ -509,7 +509,7 @@ static int init_gpib_file_private(gpib_file_private_t *priv)
 {
        memset(priv, 0, sizeof(*priv));
        atomic_set(&priv->holding_mutex, 0);
-       priv->descriptors[0] = kmalloc(sizeof(gpib_descriptor_t), GFP_KERNEL);
+       priv->descriptors[0] = kmalloc(sizeof(struct gpib_descriptor), GFP_KERNEL);
        if (!priv->descriptors[0]) {
                pr_err("gpib: failed to allocate default board descriptor\n");
                return -ENOMEM;
@@ -563,7 +563,7 @@ int ibclose(struct inode *inode, struct file *filep)
        unsigned int minor = iminor(inode);
        struct gpib_board *board;
        gpib_file_private_t *priv = filep->private_data;
-       gpib_descriptor_t *desc;
+       struct gpib_descriptor *desc;
 
        if (minor >= GPIB_MAX_NUM_BOARDS) {
                pr_err("gpib: invalid minor number of device file\n");
@@ -869,7 +869,7 @@ static int read_ioctl(gpib_file_private_t *file_priv, struct gpib_board *board,
        int end_flag = 0;
        int retval;
        ssize_t read_ret = 0;
-       gpib_descriptor_t *desc;
+       struct gpib_descriptor *desc;
        size_t nbytes;
 
        retval = copy_from_user(&read_cmd, (void __user *)arg, sizeof(read_cmd));
@@ -943,7 +943,7 @@ static int command_ioctl(gpib_file_private_t *file_priv,
        unsigned long remain;
        int retval;
        int fault = 0;
-       gpib_descriptor_t *desc;
+       struct gpib_descriptor *desc;
        size_t bytes_written;
        int no_clear_io_in_prog;
 
@@ -1027,7 +1027,7 @@ static int write_ioctl(gpib_file_private_t *file_priv, struct gpib_board *board,
        unsigned long remain;
        int retval = 0;
        int fault;
-       gpib_descriptor_t *desc;
+       struct gpib_descriptor *desc;
 
        fault = copy_from_user(&write_cmd, (void __user *)arg, sizeof(write_cmd));
        if (fault)
@@ -1189,7 +1189,7 @@ static int cleanup_open_devices(gpib_file_private_t *file_priv, struct gpib_boar
        int i;
 
        for (i = 0; i < GPIB_MAX_NUM_DESCRIPTORS; i++) {
-               gpib_descriptor_t *desc;
+               struct gpib_descriptor *desc;
 
                desc = file_priv->descriptors[i];
                if (!desc)
@@ -1228,7 +1228,7 @@ static int open_dev_ioctl(struct file *filep, struct gpib_board *board, unsigned
                mutex_unlock(&file_priv->descriptors_mutex);
                return -ERANGE;
        }
-       file_priv->descriptors[i] = kmalloc(sizeof(gpib_descriptor_t), GFP_KERNEL);
+       file_priv->descriptors[i] = kmalloc(sizeof(struct gpib_descriptor), GFP_KERNEL);
        if (!file_priv->descriptors[i]) {
                mutex_unlock(&file_priv->descriptors_mutex);
                return -ENOMEM;
@@ -1311,7 +1311,7 @@ static int wait_ioctl(gpib_file_private_t *file_priv, struct gpib_board *board,
 {
        wait_ioctl_t wait_cmd;
        int retval;
-       gpib_descriptor_t *desc;
+       struct gpib_descriptor *desc;
 
        retval = copy_from_user(&wait_cmd, (void __user *)arg, sizeof(wait_cmd));
        if (retval)
@@ -1438,7 +1438,7 @@ static int pad_ioctl(struct gpib_board *board, gpib_file_private_t *file_priv,
 {
        pad_ioctl_t cmd;
        int retval;
-       gpib_descriptor_t *desc;
+       struct gpib_descriptor *desc;
 
        retval = copy_from_user(&cmd, (void __user *)arg, sizeof(cmd));
        if (retval)
@@ -1474,7 +1474,7 @@ static int sad_ioctl(struct gpib_board *board, gpib_file_private_t *file_priv,
 {
        sad_ioctl_t cmd;
        int retval;
-       gpib_descriptor_t *desc;
+       struct gpib_descriptor *desc;
 
        retval = copy_from_user(&cmd, (void __user *)arg, sizeof(cmd));
        if (retval)
@@ -1600,7 +1600,7 @@ static int autospoll_ioctl(struct gpib_board *board, gpib_file_private_t *file_p
 {
        autospoll_ioctl_t enable;
        int retval;
-       gpib_descriptor_t *desc;
+       struct gpib_descriptor *desc;
 
        retval = copy_from_user(&enable, (void __user *)arg, sizeof(enable));
        if (retval)
@@ -2015,7 +2015,7 @@ struct gpib_board board_array[GPIB_MAX_NUM_BOARDS];
 
 LIST_HEAD(registered_drivers);
 
-void init_gpib_descriptor(gpib_descriptor_t *desc)
+void init_gpib_descriptor(struct gpib_descriptor *desc)
 {
        desc->pad = 0;
        desc->sad = -1;

diff --git a/drivers/staging/gpib/common/iblib.c b/drivers/staging/gpib/common/iblib.c
index 718df9683e7acad883000ec60c6b7803ba1a1fa7..6c13e3e917e08c545b1c88d04b20e5ee83c49c0f 100644 (file)
--- a/drivers/staging/gpib/common/iblib.c
+++ b/drivers/staging/gpib/common/iblib.c
@@ -507,7 +507,7 @@ int ibstatus(struct gpib_board *board)
 }
 
 int general_ibstatus(struct gpib_board *board, const struct gpib_status_queue *device,
-                    int clear_mask, int set_mask, gpib_descriptor_t *desc)
+                    int clear_mask, int set_mask, struct gpib_descriptor *desc)
 {
        int status = 0;
        short line_status;
@@ -574,7 +574,7 @@ static void init_wait_info(struct wait_info *winfo)
 }
 
 static int wait_satisfied(struct wait_info *winfo, struct gpib_status_queue *status_queue,
-                         int wait_mask, int *status, gpib_descriptor_t *desc)
+                         int wait_mask, int *status, struct gpib_descriptor *desc)
 {
        struct gpib_board *board = winfo->board;
        int temp_status;
@@ -623,7 +623,7 @@ static void remove_wait_timer(struct wait_info *winfo)
  * no condition is waited for.
  */
 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 *status, unsigned long usec_timeout, struct gpib_descriptor *desc)
 {
        int retval = 0;
        struct gpib_status_queue *status_queue;

diff --git a/drivers/staging/gpib/include/gpib_proto.h b/drivers/staging/gpib/include/gpib_proto.h
index 7e890a1d45523ba9a9def2c4c20870033094fcbd..4c01c436b9a711a73bc37308f1d817c82a42838a 100644 (file)
--- a/drivers/staging/gpib/include/gpib_proto.h
+++ b/drivers/staging/gpib/include/gpib_proto.h
@@ -19,7 +19,7 @@ static inline unsigned long usec_to_jiffies(unsigned int usec)
 };
 
 int serial_poll_all(struct gpib_board *board, unsigned int usec_timeout);
-void init_gpib_descriptor(gpib_descriptor_t *desc);
+void init_gpib_descriptor(struct gpib_descriptor *desc);
 int dvrsp(struct gpib_board *board, unsigned int pad, int sad,
          unsigned int usec_timeout, uint8_t *result);
 int ibcac(struct gpib_board *board, int sync, int fallback_to_async);
@@ -38,11 +38,11 @@ int ibpad(struct gpib_board *board, unsigned int addr);
 int ibsad(struct gpib_board *board, int addr);
 int ibeos(struct gpib_board *board, int eos, int eosflags);
 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 *status, unsigned long usec_timeout, struct gpib_descriptor *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 struct gpib_status_queue *device,
-                    int clear_mask, int set_mask, gpib_descriptor_t *desc);
+                    int clear_mask, int set_mask, struct gpib_descriptor *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 e03f34ecb027882544f685bdb4ddd24fa361dde7..041ac796982c5f7e482abdc6e5932bb27c709fbf 100644 (file)
--- a/drivers/staging/gpib/include/gpib_types.h
+++ b/drivers/staging/gpib/include/gpib_types.h
@@ -333,17 +333,17 @@ struct gpib_status_byte {
 void init_gpib_status_queue(struct gpib_status_queue *device);
 
 /* Used to store device-descriptor-specific information */
-typedef struct {
+struct gpib_descriptor {
        unsigned int pad;       /* primary gpib address */
        int sad;        /* secondary gpib address (negative means disabled) */
        atomic_t io_in_progress;
        unsigned is_board : 1;
        unsigned autopoll_enabled : 1;
-} gpib_descriptor_t;
+};
 
 typedef struct {
        atomic_t holding_mutex;
-       gpib_descriptor_t *descriptors[GPIB_MAX_NUM_DESCRIPTORS];
+       struct gpib_descriptor *descriptors[GPIB_MAX_NUM_DESCRIPTORS];
        /* locked while descriptors are being allocated/deallocated */
        struct mutex descriptors_mutex;
        unsigned got_module : 1;