lkml.org 
[lkml]   [2019]   [Feb]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 18/83] mfd: tps65218: Use devm_regmap_add_irq_chip and clean up error path in probe()
    Date
    From: Keerthy <j-keerthy@ti.com>

    [ Upstream commit 75d4c5e03c2ae9902ab521024b10291f6fc9515b ]

    Use devm_regmap_add_irq_chip and clean up error path in probe
    and also the remove function.

    Reported-by: Christian Hohnstaedt <Christian.Hohnstaedt@wago.com>
    Signed-off-by: Keerthy <j-keerthy@ti.com>
    Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mfd/tps65218.c | 24 +++---------------------
    1 file changed, 3 insertions(+), 21 deletions(-)

    diff --git a/drivers/mfd/tps65218.c b/drivers/mfd/tps65218.c
    index 910f569ff77c..8bcdecf494d0 100644
    --- a/drivers/mfd/tps65218.c
    +++ b/drivers/mfd/tps65218.c
    @@ -235,9 +235,9 @@ static int tps65218_probe(struct i2c_client *client,

    mutex_init(&tps->tps_lock);

    - ret = regmap_add_irq_chip(tps->regmap, tps->irq,
    - IRQF_ONESHOT, 0, &tps65218_irq_chip,
    - &tps->irq_data);
    + ret = devm_regmap_add_irq_chip(&client->dev, tps->regmap, tps->irq,
    + IRQF_ONESHOT, 0, &tps65218_irq_chip,
    + &tps->irq_data);
    if (ret < 0)
    return ret;

    @@ -253,26 +253,9 @@ static int tps65218_probe(struct i2c_client *client,
    ARRAY_SIZE(tps65218_cells), NULL, 0,
    regmap_irq_get_domain(tps->irq_data));

    - if (ret < 0)
    - goto err_irq;
    -
    - return 0;
    -
    -err_irq:
    - regmap_del_irq_chip(tps->irq, tps->irq_data);
    -
    return ret;
    }

    -static int tps65218_remove(struct i2c_client *client)
    -{
    - struct tps65218 *tps = i2c_get_clientdata(client);
    -
    - regmap_del_irq_chip(tps->irq, tps->irq_data);
    -
    - return 0;
    -}
    -
    static const struct i2c_device_id tps65218_id_table[] = {
    { "tps65218", TPS65218 },
    { },
    @@ -285,7 +268,6 @@ static struct i2c_driver tps65218_driver = {
    .of_match_table = of_tps65218_match_table,
    },
    .probe = tps65218_probe,
    - .remove = tps65218_remove,
    .id_table = tps65218_id_table,
    };

    --
    2.19.1
    \
     
     \ /
      Last update: 2019-02-13 03:57    [W:3.449 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site