lkml.org 
[lkml]   [2018]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 02/10] regulator: lm363x: Let core handle GPIO descriptor
    Date
    Use the gpiod_get() rather than the devm_* version so that the
    regulator core can handle the lifecycle of these descriptors.

    Fixes: b2d751b7f69b ("regulator: lm363x: Pass descriptor instead of GPIO number")
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    ---
    drivers/regulator/lm363x-regulator.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    diff --git a/drivers/regulator/lm363x-regulator.c b/drivers/regulator/lm363x-regulator.c
    index bbedb08d257b..06cfba441c46 100644
    --- a/drivers/regulator/lm363x-regulator.c
    +++ b/drivers/regulator/lm363x-regulator.c
    @@ -227,10 +227,10 @@ static struct gpio_desc *lm363x_regulator_of_get_enable_gpio(struct device *dev,
    */
    switch (id) {
    case LM3632_LDO_POS:
    - return devm_gpiod_get_index_optional(dev, "enable", 0,
    + return gpiod_get_index_optional(dev, "enable", 0,
    GPIOD_OUT_LOW | GPIOD_FLAGS_BIT_NONEXCLUSIVE);
    case LM3632_LDO_NEG:
    - return devm_gpiod_get_index_optional(dev, "enable", 1,
    + return gpiod_get_index_optional(dev, "enable", 1,
    GPIOD_OUT_LOW | GPIOD_FLAGS_BIT_NONEXCLUSIVE);
    default:
    return NULL;
    @@ -263,6 +263,8 @@ static int lm363x_regulator_probe(struct platform_device *pdev)
    LM3632_EXT_EN_MASK,
    LM3632_EXT_EN_MASK);
    if (ret) {
    + if (gpiod)
    + gpiod_put(gpiod);
    dev_err(dev, "External pin err: %d\n", ret);
    return ret;
    }
    @@ -270,6 +272,8 @@ static int lm363x_regulator_probe(struct platform_device *pdev)

    rdev = devm_regulator_register(dev, &lm363x_regulator_desc[id], &cfg);
    if (IS_ERR(rdev)) {
    + if (gpiod)
    + gpiod_put(gpiod);
    ret = PTR_ERR(rdev);
    dev_err(dev, "[%d] regulator register err: %d\n", id, ret);
    return ret;
    --
    2.19.1
    \
     
     \ /
      Last update: 2018-11-28 11:45    [W:4.181 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site