lkml.org 
[lkml]   [2019]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.2 228/249] gpiolib: Fix references to gpiod_[gs]et_*value_cansleep() variants
    Date
    From: Geert Uytterhoeven <geert+renesas@glider.be>

    [ Upstream commit 3285170f28a850638794cdfe712eb6d93e51e706 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpio/gpiolib.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
    index be1d1d2f8aaa..bb3104d2eb0c 100644
    --- a/drivers/gpio/gpiolib.c
    +++ b/drivers/gpio/gpiolib.c
    @@ -3025,7 +3025,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);
    }
    @@ -3046,7 +3046,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);
    @@ -3317,7 +3317,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);
    }
    @@ -3358,6 +3358,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);
    }
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-07-15 16:15    [W:7.959 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site