diff options
| author | Javier Martinez Canillas <javier.martinez@collabora.co.uk> | 2014-07-04 22:24:09 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2014-07-21 16:54:30 +0100 |
| commit | c0e0fcdaa9b307047e8f15a1e92bda0ba63f1b53 (patch) | |
| tree | effe644d93df9661115191abd7f7c35aa69a24a4 /drivers/mfd/max77686.c | |
| parent | b452d7b69d8ee1df6eb00005c0ea62cb774917c3 (diff) | |
| download | linux-c0e0fcdaa9b307047e8f15a1e92bda0ba63f1b53.tar.bz2 | |
mfd: max77686: Make error checking consistent
Error checking across the driver is mostly consistent besides
a few exceptions, so change these exceptions for consistency.
Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/max77686.c')
| -rw-r--r-- | drivers/mfd/max77686.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c index ada4976d9876..87fe52ebf7b0 100644 --- a/drivers/mfd/max77686.c +++ b/drivers/mfd/max77686.c @@ -134,7 +134,7 @@ static int max77686_i2c_probe(struct i2c_client *i2c, max77686 = devm_kzalloc(&i2c->dev, sizeof(struct max77686_dev), GFP_KERNEL); - if (max77686 == NULL) + if (!max77686) return -ENOMEM; i2c_set_clientdata(i2c, max77686); @@ -153,8 +153,8 @@ static int max77686_i2c_probe(struct i2c_client *i2c, return ret; } - if (regmap_read(max77686->regmap, - MAX77686_REG_DEVICE_ID, &data) < 0) { + ret = regmap_read(max77686->regmap, MAX77686_REG_DEVICE_ID, &data); + if (ret < 0) { dev_err(max77686->dev, "device not found on this channel (this is not an error)\n"); return -ENODEV; @@ -180,7 +180,7 @@ static int max77686_i2c_probe(struct i2c_client *i2c, IRQF_TRIGGER_FALLING | IRQF_ONESHOT | IRQF_SHARED, 0, &max77686_irq_chip, &max77686->irq_data); - if (ret != 0) { + if (ret) { dev_err(&i2c->dev, "failed to add PMIC irq chip: %d\n", ret); goto err_unregister_i2c; } @@ -188,7 +188,7 @@ static int max77686_i2c_probe(struct i2c_client *i2c, IRQF_TRIGGER_FALLING | IRQF_ONESHOT | IRQF_SHARED, 0, &max77686_rtc_irq_chip, &max77686->rtc_irq_data); - if (ret != 0) { + if (ret) { dev_err(&i2c->dev, "failed to add RTC irq chip: %d\n", ret); goto err_del_irqc; } |