Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-11 00:08:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Commit 372e722ea4dd4ca1 ("gpiolib: use descriptors internally") renamed
the functions to use a "gpiod" prefix, and commit 79a9becda8940deb
("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 1e77fc82110ac36f ("gpio: Add missing open drain/source
handling to gpiod_set_value_cansleep()").

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20190701142738.25219-1-geert+renesas@glider.be
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Geert Uytterhoeven 2019-07-01 16:27:38 +02:00 committed by Linus Walleij
parent f99d479bcb
commit 3285170f28
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpio/gpiolib.c
View File

@ -3037,7 +3037,7 @@ int gpiod_get_array_value_complex(bool raw, bool can_sleep,
int gpiod_get_raw_value(const struct gpio_desc *desc) int gpiod_get_raw_value(const struct gpio_desc *desc)
{ {
VALIDATE_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); WARN_ON(desc->gdev->chip->can_sleep);
return gpiod_get_raw_value_commit(desc); return gpiod_get_raw_value_commit(desc);
} }
@ -3058,7 +3058,7 @@ int gpiod_get_value(const struct gpio_desc *desc)
int value; int value;
VALIDATE_DESC(desc); VALIDATE_DESC(desc);
/* Should be using gpio_get_value_cansleep() */ /* Should be using gpiod_get_value_cansleep() */
WARN_ON(desc->gdev->chip->can_sleep); WARN_ON(desc->gdev->chip->can_sleep);
value = gpiod_get_raw_value_commit(desc); value = gpiod_get_raw_value_commit(desc);
@ -3329,7 +3329,7 @@ int gpiod_set_array_value_complex(bool raw, bool can_sleep,
void gpiod_set_raw_value(struct gpio_desc *desc, int value) void gpiod_set_raw_value(struct gpio_desc *desc, int value)
{ {
VALIDATE_DESC_VOID(desc); 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); WARN_ON(desc->gdev->chip->can_sleep);
gpiod_set_raw_value_commit(desc, value); gpiod_set_raw_value_commit(desc, value);
} }
@ -3370,6 +3370,7 @@ static void gpiod_set_value_nocheck(struct gpio_desc *desc, int value)
void gpiod_set_value(struct gpio_desc *desc, int value) void gpiod_set_value(struct gpio_desc *desc, int value)
{ {
VALIDATE_DESC_VOID(desc); VALIDATE_DESC_VOID(desc);
/* Should be using gpiod_set_value_cansleep() */
WARN_ON(desc->gdev->chip->can_sleep); WARN_ON(desc->gdev->chip->can_sleep);
gpiod_set_value_nocheck(desc, value); gpiod_set_value_nocheck(desc, value);
} }