Merge tag 'platform-drivers-x86-v4.4-2' of git://git.infradead.org/users/dvhart/linux...

[karo-tx-linux.git] / drivers / mfd / lm3533-core.c

diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c
index 643f3750e83079d11e7042c7e36e73ce20c26c19..5abcbb2e8849607f2e626109d3ddda0eb60dc9dd 100644 (file)
--- a/drivers/mfd/lm3533-core.c
+++ b/drivers/mfd/lm3533-core.c
@@ -472,11 +472,7 @@ static int lm3533_device_setup(struct lm3533 *lm3533,
        if (ret)
                return ret;
 
-       ret = lm3533_set_boost_ovp(lm3533, pdata->boost_ovp);
-       if (ret)
-               return ret;
-
-       return 0;
+       return lm3533_set_boost_ovp(lm3533, pdata->boost_ovp);
 }
 
 static int lm3533_device_init(struct lm3533 *lm3533)
@@ -596,7 +592,6 @@ static int lm3533_i2c_probe(struct i2c_client *i2c,
                                        const struct i2c_device_id *id)
 {
        struct lm3533 *lm3533;
-       int ret;
 
        dev_dbg(&i2c->dev, "%s\n", __func__);
 
@@ -613,11 +608,7 @@ static int lm3533_i2c_probe(struct i2c_client *i2c,
        lm3533->dev = &i2c->dev;
        lm3533->irq = i2c->irq;
 
-       ret = lm3533_device_init(lm3533);
-       if (ret)
-               return ret;
-
-       return 0;
+       return lm3533_device_init(lm3533);
 }
 
 static int lm3533_i2c_remove(struct i2c_client *i2c)