lkml.org 
[lkml]   [2012]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 1/5] mfd: rc5t583: Convert to devm_regmap_init_i2c()
    From
    Date
    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    ---
    drivers/mfd/rc5t583.c | 7 ++-----
    1 files changed, 2 insertions(+), 5 deletions(-)

    diff --git a/drivers/mfd/rc5t583.c b/drivers/mfd/rc5t583.c
    index 1cb4c35..cdc1df7 100644
    --- a/drivers/mfd/rc5t583.c
    +++ b/drivers/mfd/rc5t583.c
    @@ -268,7 +268,7 @@ static int __devinit rc5t583_i2c_probe(struct i2c_client *i2c,
    rc5t583->dev = &i2c->dev;
    i2c_set_clientdata(i2c, rc5t583);

    - rc5t583->regmap = regmap_init_i2c(i2c, &rc5t583_regmap_config);
    + rc5t583->regmap = devm_regmap_init_i2c(i2c, &rc5t583_regmap_config);
    if (IS_ERR(rc5t583->regmap)) {
    ret = PTR_ERR(rc5t583->regmap);
    dev_err(&i2c->dev, "regmap initialization failed: %d\n", ret);
    @@ -277,7 +277,7 @@ static int __devinit rc5t583_i2c_probe(struct i2c_client *i2c,

    ret = rc5t583_clear_ext_power_req(rc5t583, pdata);
    if (ret < 0)
    - goto err_irq_init;
    + return ret;

    if (i2c->irq) {
    ret = rc5t583_irq_init(rc5t583, i2c->irq, pdata->irq_base);
    @@ -300,8 +300,6 @@ static int __devinit rc5t583_i2c_probe(struct i2c_client *i2c,
    err_add_devs:
    if (irq_init_success)
    rc5t583_irq_exit(rc5t583);
    -err_irq_init:
    - regmap_exit(rc5t583->regmap);
    return ret;
    }

    @@ -311,7 +309,6 @@ static int __devexit rc5t583_i2c_remove(struct i2c_client *i2c)

    mfd_remove_devices(rc5t583->dev);
    rc5t583_irq_exit(rc5t583);
    - regmap_exit(rc5t583->regmap);
    return 0;
    }

    --
    1.7.5.4




    \
     
     \ /
      Last update: 2012-04-25 04:09    [W:3.220 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site