extcon: max77693: Use max77693_update_reg for rmw operations

PATCH Applied Axel Lin 2 participants 2 messages Oct 2, 2012 – Oct 4, 2012

Subsystems (2)

External connector subsystem (extcon) Maxim PMIC and MUIC drivers for Exynos based boards

lore

Share & tools

lore

Axel Lin

author

2012-10-02 15:59 UTC #0 lore raw

PATCH 1/1 extcon: max77693: Use max77693_update_reg for rmw operations

This simplifies the code.

Signed-off-by Axel Lin <[email protected]>

---
 drivers/extcon/extcon-max77693.c |   18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

drivers/extcon/extcon-max77693.c +6 ~~-12~~

index e21387e..e0ed622 100644
@@ -239,25 +239,19 @@ const char *max77693_extcon_cable[] = {
 static int max77693_muic_set_debounce_time(struct max77693_muic_info *info,
 		enum max77693_muic_adc_debounce_time time)
 {
-	int ret = 0;
-	u8 ctrl3;
+	int ret;
 
 	switch (time) {
 	case ADC_DEBOUNCE_TIME_5MS:
 	case ADC_DEBOUNCE_TIME_10MS:
 	case ADC_DEBOUNCE_TIME_25MS:
 	case ADC_DEBOUNCE_TIME_38_62MS:
-		ret = max77693_read_reg(info->max77693->regmap_muic,
-				MAX77693_MUIC_REG_CTRL3, &ctrl3);
-		ctrl3 &= ~CONTROL3_ADCDBSET_MASK;
-		ctrl3 |= (time << CONTROL3_ADCDBSET_SHIFT);
-
-		ret = max77693_write_reg(info->max77693->regmap_muic,
-				MAX77693_MUIC_REG_CTRL3, ctrl3);
-		if (ret) {
+		ret = max77693_update_reg(info->max77693->regmap_muic,
+					  MAX77693_MUIC_REG_CTRL3,
+					  time << CONTROL3_ADCDBSET_SHIFT,
+					  CONTROL3_ADCDBSET_MASK);
+		if (ret)
 			dev_err(info->dev, "failed to set ADC debounce time\n");
-			ret = -EINVAL;
-		}
 		break;
 	default:
 		dev_err(info->dev, "invalid ADC debounce time\n");

Signature · 1 line

1.7.9.5

Chanwoo Choi

maintainer Applied

2012-10-04 01:34 UTC #1 lore raw

Quoted 33 lines · Axel Lin

This simplifies the code.

Signed-off-by Axel Lin <[email protected]>

---
 drivers/extcon/extcon-max77693.c |   18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

drivers/extcon/extcon-max77693.c +2 ~~-10~~

index e21387e..e0ed622 100644
@@ -239,25 +239,19 @@ const char *max77693_extcon_cable[] = {
 static int max77693_muic_set_debounce_time(struct max77693_muic_info *info,
 		enum max77693_muic_adc_debounce_time time)
 {
-	int ret = 0;
-	u8 ctrl3;
+	int ret;
 
 	switch (time) {
 	case ADC_DEBOUNCE_TIME_5MS:
 	case ADC_DEBOUNCE_TIME_10MS:
 	case ADC_DEBOUNCE_TIME_25MS:
 	case ADC_DEBOUNCE_TIME_38_62MS:
-		ret = max77693_read_reg(info->max77693->regmap_muic,
-				MAX77693_MUIC_REG_CTRL3, &ctrl3);
-		ctrl3 &= ~CONTROL3_ADCDBSET_MASK;
-		ctrl3 |= (time << CONTROL3_ADCDBSET_SHIFT);
-
-		ret = max77693_write_reg(info->max77693->regmap_muic,
-				MAX77693_MUIC_REG_CTRL3, ctrl3);
-		if (ret) {
+		ret = max77693_update_reg(info->max77693->regmap_muic,

drivers/extcon/extcon-max77693.c const char *max77693_extcon_cable[] = { · line 257

Quoted 10 lines

drivers/extcon/extcon-max77693.c +4 -2

+					  MAX77693_MUIC_REG_CTRL3,
+					  time << CONTROL3_ADCDBSET_SHIFT,
+					  CONTROL3_ADCDBSET_MASK);
+		if (ret)
 			dev_err(info->dev, "failed to set ADC debounce time\n");
-			ret = -EINVAL;
-		}
 		break;
 	default:
 		dev_err(info->dev, "invalid ADC debounce time\n");

Applied, thanks.

Cheers,
Chanwoo Choi