]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
leds: lm3642: Use regmap_update_bits() in lm3642_chip_init()
authorAxel Lin <axel.lin@ingics.com>
Sat, 22 Sep 2012 06:40:14 +0000 (14:40 +0800)
committerBryan Wu <bryan.wu@canonical.com>
Mon, 24 Sep 2012 04:24:22 +0000 (12:24 +0800)
Use regmap_update_bits() to replace regmap_read() + regmap_write().
With this patch, we only show the error message when regmap_update_bits()
fails.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: G.Shark Jeong<gshark.jeong@gmail.com>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
drivers/leds/leds-lm3642.c

index 924853b7922c4e2938bd1ee5cb424b2747bf9b62..3285006e988820ebb763ef47709842549d6bad5e 100644 (file)
@@ -95,23 +95,14 @@ struct lm3642_chip_data {
 /* chip initialize */
 static int __devinit lm3642_chip_init(struct lm3642_chip_data *chip)
 {
-       unsigned int reg_val;
        int ret;
        struct lm3642_platform_data *pdata = chip->pdata;
 
        /* set enable register */
-       ret = regmap_read(chip->regmap, REG_ENABLE, &reg_val);
+       ret = regmap_update_bits(chip->regmap, REG_ENABLE, EX_PIN_ENABLE_MASK,
+                                pdata->tx_pin);
        if (ret < 0)
-               goto out;
-
-       reg_val &= (~EX_PIN_ENABLE_MASK);
-       reg_val |= pdata->tx_pin;
-       ret = regmap_write(chip->regmap, REG_ENABLE, reg_val);
-       if (ret < 0)
-               goto out;
-
-out:
-       dev_err(chip->dev, "Failed to read REG_ENABLE Register\n");
+               dev_err(chip->dev, "Failed to update REG_ENABLE Register\n");
        return ret;
 }