Commit 234c5209 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Bartosz Golaszewski
Browse files

gpiolib: Extract gpio_chip_get_value() wrapper 



In couple of cases we are using the same code to wrap ->get() callback.
Extract that code into a helper for the sake of better maintenance.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
parent 3de69ae1

drivers/gpio/gpiolib.c

+7 −4
Original line number Diff line number Diff line
@@ -2513,6 +2513,11 @@ void gpiod_toggle_active_low(struct gpio_desc *desc) 
}

EXPORT_SYMBOL_GPL(gpiod_toggle_active_low);



static int gpio_chip_get_value(struct gpio_chip *gc, const struct gpio_desc *desc)

{

	return gc->get ? gc->get(gc, gpio_chip_hwgpio(desc)) : -EIO;

}



/* I/O calls are only valid after configuration completed; the relevant

 * "is this a valid GPIO" error checks should already have been done.

 *
@@ -2538,12 +2543,10 @@ EXPORT_SYMBOL_GPL(gpiod_toggle_active_low); 
static int gpiod_get_raw_value_commit(const struct gpio_desc *desc)

{

	struct gpio_chip	*gc;

	int offset;

	int value;



	gc = desc->gdev->chip;

	offset = gpio_chip_hwgpio(desc);

	value = gc->get ? gc->get(gc, offset) : -EIO;

	value = gpio_chip_get_value(gc, desc);

	value = value < 0 ? value : !!value;

	trace_gpio_value(desc_to_gpio(desc), 1, value);

	return value;
@@ -4387,7 +4390,7 @@ static void gpiolib_dbg_show(struct seq_file *s, struct gpio_device *gdev) 
		if (test_bit(FLAG_REQUESTED, &desc->flags)) {

			gpiod_get_direction(desc);

			is_out = test_bit(FLAG_IS_OUT, &desc->flags);

			value = gc->get ? gc->get(gc, gpio_chip_hwgpio(desc)) : -EIO;

			value = gpio_chip_get_value(gc, desc);

			is_irq = test_bit(FLAG_USED_AS_IRQ, &desc->flags);

			active_low = test_bit(FLAG_ACTIVE_LOW, &desc->flags);

			seq_printf(s, " gpio-%-3d (%-20.20s|%-20.20s) %s %s %s%s\n",