Commit 8beaf839 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Bartosz Golaszewski
Browse files

gpiolib: Deduplicate gpiod_direction_input_nonotify() call 



Deduplicate gpiod_direction_input_nonotify() call in
gpiod_direction_output_nonotify() when emulating open-drain
or open-source behaviour. It also aligns the error check
approaches in set_output_value and set_output_flag labels.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20250204175646.150577-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent eb2e9c30

drivers/gpio/gpiolib.c

+7 −9
Original line number Diff line number Diff line
@@ -2873,19 +2873,15 @@ int gpiod_direction_output_nonotify(struct gpio_desc *desc, int value) 
		if (!ret)

			goto set_output_value;

		/* Emulate open drain by not actively driving the line high */

		if (value) {

			ret = gpiod_direction_input_nonotify(desc);

		if (value)

			goto set_output_flag;

		}

	} else if (test_bit(FLAG_OPEN_SOURCE, &flags)) {

		ret = gpio_set_config(desc, PIN_CONFIG_DRIVE_OPEN_SOURCE);

		if (!ret)

			goto set_output_value;

		/* Emulate open source by not actively driving the line low */

		if (!value) {

			ret = gpiod_direction_input_nonotify(desc);

		if (!value)

			goto set_output_flag;

		}

	} else {

		gpio_set_config(desc, PIN_CONFIG_DRIVE_PUSH_PULL);

	}
@@ -2897,15 +2893,17 @@ int gpiod_direction_output_nonotify(struct gpio_desc *desc, int value) 
	return gpiod_direction_output_raw_commit(desc, value);



set_output_flag:

	ret = gpiod_direction_input_nonotify(desc);

	if (ret)

		return ret;

	/*

	 * When emulating open-source or open-drain functionalities by not

	 * actively driving the line (setting mode to input) we still need to

	 * set the IS_OUT flag or otherwise we won't be able to set the line

	 * value anymore.

	 */

	if (ret == 0)

	set_bit(FLAG_IS_OUT, &desc->flags);

	return ret;

	return 0;

}



/**