gpiolib: Deduplicate gpiod_direction_input_nonotify() call
PATCH 1/1 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 Andy Shevchenko <[email protected]>
--- drivers/gpio/gpiolib.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/gpio/gpiolib.c +7 -9
@@ -2872,19 +2872,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 ); }
@@ -2896,15 +2892,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; +set_bit (FLAG_IS_OUT , &desc->flags); +return 0 ; }/**
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
From: Bartosz Golaszewski <[email protected]>
Quoted 6 lines · Andy Shevchenko
Deduplicate
gpiod_direction_input_nonotify()call ingpiod_direction_output_nonotify()when emulating open-drain or open-source behaviour. It also aligns the error check approaches inset_output_valueandset_output_flaglabels.
Meh, it's a bit of churn IMO but whatever.
[1/1] gpiolib: Deduplicate gpiod_direction_input_nonotify() call
commit: 8beaf839018096cd20e427e68645b4fbecdcb1f0
Best regards,
Signature · 1 line
Bartosz Golaszewski <[email protected]>