Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ad04d31 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman
Browse files

gpiolib: Fix references to gpiod_[gs]et_*value_cansleep() variants 



[ Upstream commit 3285170f28a850638794cdfe712eb6d93e51e706 ]

Commit 372e722e ("gpiolib: use descriptors internally") renamed
the functions to use a "gpiod" prefix, and commit 79a9becd
("gpiolib: export descriptor-based GPIO interface") introduced the "raw"
variants, but both changes forgot to update the comments.

Readd a similar reference to gpiod_set_value(), which was accidentally
removed by commit 1e77fc82 ("gpio: Add missing open drain/source
handling to gpiod_set_value_cansleep()").

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20190701142738.25219-1-geert+renesas@glider.be


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 157d1c7a

drivers/gpio/gpiolib.c

+4 −3
Original line number Diff line number Diff line
@@ -2877,7 +2877,7 @@ int gpiod_get_array_value_complex(bool raw, bool can_sleep, 
int gpiod_get_raw_value(const struct gpio_desc *desc)

{

	VALIDATE_DESC(desc);

	/* Should be using gpio_get_value_cansleep() */

	/* Should be using gpiod_get_raw_value_cansleep() */

	WARN_ON(desc->gdev->chip->can_sleep);

	return gpiod_get_raw_value_commit(desc);

}
@@ -2898,7 +2898,7 @@ int gpiod_get_value(const struct gpio_desc *desc) 
	int value;



	VALIDATE_DESC(desc);

	/* Should be using gpio_get_value_cansleep() */

	/* Should be using gpiod_get_value_cansleep() */

	WARN_ON(desc->gdev->chip->can_sleep);



	value = gpiod_get_raw_value_commit(desc);
@@ -3123,7 +3123,7 @@ int gpiod_set_array_value_complex(bool raw, bool can_sleep, 
void gpiod_set_raw_value(struct gpio_desc *desc, int value)

{

	VALIDATE_DESC_VOID(desc);

	/* Should be using gpiod_set_value_cansleep() */

	/* Should be using gpiod_set_raw_value_cansleep() */

	WARN_ON(desc->gdev->chip->can_sleep);

	gpiod_set_raw_value_commit(desc, value);

}
@@ -3164,6 +3164,7 @@ static void gpiod_set_value_nocheck(struct gpio_desc *desc, int value) 
void gpiod_set_value(struct gpio_desc *desc, int value)

{

	VALIDATE_DESC_VOID(desc);

	/* Should be using gpiod_set_value_cansleep() */

	WARN_ON(desc->gdev->chip->can_sleep);

	gpiod_set_value_nocheck(desc, value);

}