rk:modify some warnings for pmu

diff --git a/arch/arm/mach-rk30/board-pmu-wm8326.c b/arch/arm/mach-rk30/board-pmu-wm8326.c
index 937d8299d008fff8b0a33c74891ba017d2fbb2cc..0aa7f7ab9a00b124f3d762e36e4d3e962f783baf 100755 (executable)
--- a/arch/arm/mach-rk30/board-pmu-wm8326.c
+++ b/arch/arm/mach-rk30/board-pmu-wm8326.c
@@ -687,7 +687,7 @@ out:
 }
 
 #ifdef CONFIG_HAS_EARLYSUSPEND
-void wm831x_pmu_early_suspend(struct regulator_dev *rdev)
+void wm831x_pmu_early_suspend(struct early_suspend *h)
 {
        struct regulator *dcdc;
        struct regulator *ldo;
@@ -726,7 +726,7 @@ void wm831x_pmu_early_suspend(struct regulator_dev *rdev)
        udelay(100);    
                
 }
-void wm831x_pmu_early_resume(struct regulator_dev *rdev)
+void wm831x_pmu_early_resume(struct early_suspend *h)
 {
        struct regulator *dcdc;
        struct regulator *ldo;

diff --git a/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c b/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c
index 3ad9b7d8ceb757d4f6f02c49bce32496a9a8df1d..c491b3782dd4ff0e153be1187ebd079478cb7e00 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c
+++ b/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c
@@ -794,7 +794,7 @@ out:
 }
 
 #ifdef CONFIG_HAS_EARLYSUSPEND
-void wm831x_pmu_early_suspend(struct regulator_dev *rdev)
+void wm831x_pmu_early_suspend(struct early_suspend *h)
 {
        struct regulator *dcdc;
        struct regulator *ldo;
@@ -833,7 +833,7 @@ void wm831x_pmu_early_suspend(struct regulator_dev *rdev)
        udelay(100);    
                
 }
-void wm831x_pmu_early_resume(struct regulator_dev *rdev)
+void wm831x_pmu_early_resume(struct early_suspend *h)
 {
        struct regulator *dcdc;
        struct regulator *ldo;

diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index 6ff1849eba14b6d66c764222442f538dd7f4bc06..c2f293fc67a0ffae9a97063ffb6616e26f36a8a6 100755 (executable)
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -1471,8 +1471,8 @@ static struct mfd_cell backlight_devs[] = {
  * Instantiate the generic non-control parts of the device.
  */
 
-__weak void  wm831x_pmu_early_suspend(struct regulator_dev *rdev) {}
-__weak void  wm831x_pmu_early_resume(struct regulator_dev *rdev) {}
+__weak void  wm831x_pmu_early_suspend(struct early_suspend *h) {}
+__weak void  wm831x_pmu_early_resume(struct early_suspend *h) {}
 
 int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
 {

diff --git a/drivers/regulator/act8846.c b/drivers/regulator/act8846.c
index f4b14a3b3e7e1aac68088919ca1a5c245edbeb85..2c4da0dbfafe3093eb4d52b0253e9dc09bd571af 100755 (executable)
--- a/drivers/regulator/act8846.c
+++ b/drivers/regulator/act8846.c
@@ -554,7 +554,7 @@ static int act8846_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;