[PATCH] leds: lm3642: Use regmap_update_bits() in lm3642_chip_init()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxx>
---
 drivers/leds/leds-lm3642.c |   15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/drivers/leds/leds-lm3642.c b/drivers/leds/leds-lm3642.c
index 924853b..3285006 100644
--- a/drivers/leds/leds-lm3642.c
+++ b/drivers/leds/leds-lm3642.c
@@ -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;
 }
 
-- 
1.7.9.5



--
To unsubscribe from this list: send the line "unsubscribe linux-leds" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux