regulator: act8931: fix gcc warning

diff --git a/drivers/regulator/act8931.c b/drivers/regulator/act8931.c
index ba4e6ed30de5a6865946b1eaae39eaaba205811c..742c7e3434f6d2d3c5ea5fe3c5630d5eb16672d9 100755 (executable)
--- a/drivers/regulator/act8931.c
+++ b/drivers/regulator/act8931.c
@@ -169,7 +169,7 @@ static int act8931_ldo_get_voltage(struct regulator_dev *dev)
        return val;
 }
 static int act8931_ldo_set_voltage(struct regulator_dev *dev,
-                                 int min_uV, int max_uV)
+                                 int min_uV, int max_uV, unsigned *selector)
 {
        struct act8931 *act8931 = rdev_get_drvdata(dev);
        int ldo= rdev_get_id(dev) -ACT8931_LDO1;
@@ -191,11 +191,10 @@ static int act8931_ldo_set_voltage(struct regulator_dev *dev,
 
        ret = act8931_set_bits(act8931, act8931_LDO_SET_VOL_REG(ldo),
                LDO_VOL_MASK, val);
-       if (ret)
-               return ret;
+       return ret;
 
 }
-static int act8931_ldo_get_mode(struct regulator_dev *dev, unsigned index)
+static unsigned int act8931_ldo_get_mode(struct regulator_dev *dev)
 {
        struct act8931 *act8931 = rdev_get_drvdata(dev);
        int ldo = rdev_get_id(dev) -ACT8931_LDO1 ;
@@ -287,7 +286,7 @@ static int act8931_dcdc_get_voltage(struct regulator_dev *dev)
        return val;
 }
 static int act8931_dcdc_set_voltage(struct regulator_dev *dev,
-                                 int min_uV, int max_uV)
+                                 int min_uV, int max_uV, unsigned *selector)
 {
        struct act8931 *act8931 = rdev_get_drvdata(dev);
        int buck = rdev_get_id(dev) -ACT8931_DCDC1 ;
@@ -315,7 +314,7 @@ static int act8931_dcdc_set_voltage(struct regulator_dev *dev,
        //if (ret)
                return ret;
 }
-static int act8931_dcdc_get_mode(struct regulator_dev *dev, unsigned index)
+static unsigned int act8931_dcdc_get_mode(struct regulator_dev *dev)
 {
        struct act8931 *act8931 = rdev_get_drvdata(dev);
        int buck = rdev_get_id(dev) -ACT8931_DCDC1 ;
@@ -441,7 +440,7 @@ static int act8931_i2c_read(struct i2c_client *i2c, char reg, int count,    u16 *de
     msgs[0].len = 1;
     msgs[0].scl_rate = 200*1000;
     
-    msgs[1].buf = dest;
+    msgs[1].buf = (u8 *)dest;
     msgs[1].addr = i2c->addr;
     msgs[1].flags = i2c->flags | I2C_M_RD;
     msgs[1].len = 1;

diff --git a/include/linux/regulator/act8931.h b/include/linux/regulator/act8931.h
index 2c1a34a2e1810d92f229878063ab04cc742df5a6..ba0259eb9a466475f119d49fc07641fef25bfa6e 100755 (executable)
--- a/include/linux/regulator/act8931.h
+++ b/include/linux/regulator/act8931.h
@@ -37,10 +37,6 @@ struct act8931;
 /*
  * Register definitions to all subdrivers
  */
-static u8 act8931_reg_read(struct act8931 *act8931, u8 reg);
-static int act8931_set_bits(struct act8931 *act8931, u8 reg, u16 mask, u16 val);
-
-
 #define act8931_BUCK1_SET_VOL_BASE 0x20
 #define act8931_BUCK2_SET_VOL_BASE 0x30
 #define act8931_BUCK3_SET_VOL_BASE 0x40