2 files changed, 6 insertions, 10 deletions

diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c
index b1c1444864b3..10d5a1d9768e 100644
--- a/drivers/regulator/max8997.c
+++ b/drivers/regulator/max8997.c
@@ -1032,11 +1032,11 @@ static __devinit int max8997_pmic_probe(struct platform_device *pdev)
 
         /* For the safety, set max voltage before setting up */
         for (i = 0; i < 8; i++) {
-                max8997_update_reg(i2c, MAX8997_REG_BUCK1DVS(i + 1),
+                max8997_update_reg(i2c, MAX8997_REG_BUCK1DVS1 + i,
                                 max_buck1, 0x3f);
-                max8997_update_reg(i2c, MAX8997_REG_BUCK2DVS(i + 1),
+                max8997_update_reg(i2c, MAX8997_REG_BUCK2DVS1 + i,
                                 max_buck2, 0x3f);
-                max8997_update_reg(i2c, MAX8997_REG_BUCK5DVS(i + 1),
+                max8997_update_reg(i2c, MAX8997_REG_BUCK5DVS1 + i,
                                 max_buck5, 0x3f);
         }
 
@@ -1113,13 +1113,13 @@ static __devinit int max8997_pmic_probe(struct platform_device *pdev)
 
         /* Initialize all the DVS related BUCK registers */
         for (i = 0; i < 8; i++) {
-                max8997_update_reg(i2c, MAX8997_REG_BUCK1DVS(i + 1),
+                max8997_update_reg(i2c, MAX8997_REG_BUCK1DVS1 + i,
                                 max8997->buck1_vol[i],
                                 0x3f);
-                max8997_update_reg(i2c, MAX8997_REG_BUCK2DVS(i + 1),
+                max8997_update_reg(i2c, MAX8997_REG_BUCK2DVS1 + i,
                                 max8997->buck2_vol[i],
                                 0x3f);
-                max8997_update_reg(i2c, MAX8997_REG_BUCK5DVS(i + 1),
+                max8997_update_reg(i2c, MAX8997_REG_BUCK5DVS1 + i,
                                 max8997->buck5_vol[i],
                                 0x3f);
         }
diff --git a/include/linux/mfd/max8997-private.h b/include/linux/mfd/max8997-private.h
index 69d1010e2e51..5ff2400ad46c 100644
--- a/include/linux/mfd/max8997-private.h
+++ b/include/linux/mfd/max8997-private.h
@@ -311,10 +311,6 @@ enum max8997_irq {
         MAX8997_IRQ_NR,
 };
 
-#define MAX8997_REG_BUCK1DVS(x) (MAX8997_REG_BUCK1DVS1 + (x) - 1)
-#define MAX8997_REG_BUCK2DVS(x) (MAX8997_REG_BUCK2DVS1 + (x) - 1)
-#define MAX8997_REG_BUCK5DVS(x) (MAX8997_REG_BUCK5DVS1 + (x) - 1)
-
 #define MAX8997_NUM_GPIO        12
 struct max8997_dev {
         struct device *dev;