From 9749caf03e23daf79f6f861e6d26ae64c042908b Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=BC=A0=E6=99=B4?= Date: Wed, 26 Dec 2012 18:20:38 +0800 Subject: [PATCH] rk:modify some warnings for pmu --- arch/arm/mach-rk30/board-pmu-wm8326.c | 4 ++-- arch/arm/mach-rk30/board-rk30-sdk-wm8326.c | 4 ++-- drivers/mfd/wm831x-core.c | 4 ++-- drivers/regulator/act8846.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-rk30/board-pmu-wm8326.c b/arch/arm/mach-rk30/board-pmu-wm8326.c index 937d8299d008..0aa7f7ab9a00 100755 --- 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 3ad9b7d8ceb7..c491b3782dd4 100755 --- 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 6ff1849eba14..c2f293fc67a0 100755 --- 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 f4b14a3b3e7e..2c4da0dbfafe 100755 --- 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; -- 2.34.1