]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
gpio: virtuser: Use GPIO_LOOKUP_IDX() macro
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 20 Aug 2024 20:08:58 +0000 (23:08 +0300)
committerBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Wed, 21 Aug 2024 10:18:21 +0000 (12:18 +0200)
Use GPIO_LOOKUP_IDX() macro which provides a compound literal
and can be used with dynamic data.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20240820200858.3659995-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
drivers/gpio/gpio-virtuser.c

index ccc47ea0b3e1227de099790ee01b893a4487c9ef..91b6352c957cf9daff8fcb6f813dfb82518d6afb 100644 (file)
@@ -1410,7 +1410,6 @@ gpio_virtuser_make_lookup_table(struct gpio_virtuser_device *dev)
        size_t num_entries = gpio_virtuser_get_lookup_count(dev);
        struct gpio_virtuser_lookup_entry *entry;
        struct gpio_virtuser_lookup *lookup;
-       struct gpiod_lookup *curr;
        unsigned int i = 0;
 
        lockdep_assert_held(&dev->lock);
@@ -1426,14 +1425,10 @@ gpio_virtuser_make_lookup_table(struct gpio_virtuser_device *dev)
 
        list_for_each_entry(lookup, &dev->lookup_list, siblings) {
                list_for_each_entry(entry, &lookup->entry_list, siblings) {
-                       curr = &table->table[i];
-
-                       curr->con_id = lookup->con_id;
-                       curr->idx = i;
-                       curr->key = entry->key;
-                       curr->chip_hwnum = entry->offset < 0 ?
-                                               U16_MAX : entry->offset;
-                       curr->flags = entry->flags;
+                       table->table[i] =
+                               GPIO_LOOKUP_IDX(entry->key,
+                                               entry->offset < 0 ? U16_MAX : entry->offset,
+                                               lookup->con_id, i, entry->flags);
                        i++;
                }
        }