staging: gpib: Cleanup allocate_gpios code

The function was using unnecessary variables error and retval.
Simplify the code by testing for failure first and remove the
redundant variables.

Tested-by: Dave Penkler <dpenkler@gmail.com>
Signed-off-by: Dave Penkler <dpenkler@gmail.com>
Link: https://lore.kernel.org/r/20250418173434.2892-8-dpenkler@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/gpib/gpio/gpib_bitbang.c b/drivers/staging/gpib/gpio/gpib_bitbang.c
index 86b98eb1ce692040f7a03fd4cd9fad3f6a6ecccd..5c134cfb6d61f5b76c6caef9ea5de43bec9f3875 100644 (file)
--- a/drivers/staging/gpib/gpio/gpib_bitbang.c
+++ b/drivers/staging/gpib/gpio/gpib_bitbang.c
@@ -1123,8 +1123,7 @@ static void release_gpios(void)
 
 static int allocate_gpios(struct gpib_board *board)
 {
-       int j, retval = 0;
-       bool error = false;
+       int j;
        int table_index = 0;
        char name[256];
        struct gpio_desc *desc;
@@ -1135,8 +1134,8 @@ static int allocate_gpios(struct gpib_board *board)
                return -ENOENT;
        }
 
-       lookup_table = lookup_tables[0];
-       lookup_table->dev_id   = dev_name(board->gpib_dev);
+       lookup_table = lookup_tables[table_index];
+       lookup_table->dev_id = dev_name(board->gpib_dev);
        gpiod_add_lookup_table(lookup_table);
        dbg_printk(1, "Allocating gpios using table index %d\n", table_index);
 
@@ -1153,28 +1152,26 @@ try_again:
                        gpiod_remove_lookup_table(lookup_table);
                        table_index++;
                        lookup_table = lookup_tables[table_index];
-                       if (lookup_table) {
-                               dbg_printk(1, "Allocation failed,  now  using table_index %d\n",
-                                          table_index);
-                               lookup_table->dev_id = dev_name(board->gpib_dev);
-                               gpiod_add_lookup_table(lookup_table);
-                               goto try_again;
+                       if (!lookup_table) {
+                               dev_err(board->gpib_dev, "Unable to obtain gpio descriptor for pin %d error %ld\n",
+                                       gpios_vector[j], PTR_ERR(desc));
+                               goto alloc_gpios_fail;
                        }
-                       dev_err(board->gpib_dev, "Unable to obtain gpio descriptor for pin %d error %ld\n",
-                               gpios_vector[j], PTR_ERR(desc));
-                       error = true;
-                       break;
+                       dbg_printk(1, "Allocation failed, now using table_index %d\n", table_index);
+                       lookup_table->dev_id = dev_name(board->gpib_dev);
+                       gpiod_add_lookup_table(lookup_table);
+                       goto try_again;
                }
                all_descriptors[j] = desc;
        }
 
-       if (error) { /* undo what already done */
-               release_gpios();
-               retval = -1;
-       }
-       if (lookup_table)
-               gpiod_remove_lookup_table(lookup_table);
-       return retval;
+       gpiod_remove_lookup_table(lookup_table);
+
+       return 0;
+
+alloc_gpios_fail:
+       release_gpios();
+       return -1;
 }
 
 static void bb_detach(struct gpib_board *board)