Commit 35d9bb5f authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Bartosz Golaszewski
Browse files

gpiolib: Move validate_desc() and Co upper in the code 



Move validate_desc() and Co upper in the code to be able to use
in the further changes.

Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20250416095645.2027695-6-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
parent df6dccb4

drivers/gpio/gpiolib.c

+31 −31
Original line number Diff line number Diff line
@@ -356,6 +356,37 @@ static int gpiochip_find_base_unlocked(u16 ngpio) 
	}

}



/*

 * This descriptor validation needs to be inserted verbatim into each

 * function taking a descriptor, so we need to use a preprocessor

 * macro to avoid endless duplication. If the desc is NULL it is an

 * optional GPIO and calls should just bail out.

 */

static int validate_desc(const struct gpio_desc *desc, const char *func)

{

	if (!desc)

		return 0;



	if (IS_ERR(desc)) {

		pr_warn("%s: invalid GPIO (errorpointer: %pe)\n", func, desc);

		return PTR_ERR(desc);

	}



	return 1;

}



#define VALIDATE_DESC(desc) do { \

	int __valid = validate_desc(desc, __func__); \

	if (__valid <= 0) \

		return __valid; \

	} while (0)



#define VALIDATE_DESC_VOID(desc) do { \

	int __valid = validate_desc(desc, __func__); \

	if (__valid <= 0) \

		return; \

	} while (0)



static int gpiochip_get_direction(struct gpio_chip *gc, unsigned int offset)

{

	int ret;
@@ -2431,37 +2462,6 @@ static int gpiod_request_commit(struct gpio_desc *desc, const char *label) 
	return ret;

}



/*

 * This descriptor validation needs to be inserted verbatim into each

 * function taking a descriptor, so we need to use a preprocessor

 * macro to avoid endless duplication. If the desc is NULL it is an

 * optional GPIO and calls should just bail out.

 */

static int validate_desc(const struct gpio_desc *desc, const char *func)

{

	if (!desc)

		return 0;



	if (IS_ERR(desc)) {

		pr_warn("%s: invalid GPIO (errorpointer: %pe)\n", func, desc);

		return PTR_ERR(desc);

	}



	return 1;

}



#define VALIDATE_DESC(desc) do { \

	int __valid = validate_desc(desc, __func__); \

	if (__valid <= 0) \

		return __valid; \

	} while (0)



#define VALIDATE_DESC_VOID(desc) do { \

	int __valid = validate_desc(desc, __func__); \

	if (__valid <= 0) \

		return; \

	} while (0)



int gpiod_request(struct gpio_desc *desc, const char *label)

{

	int ret = -EPROBE_DEFER;