diff options
| author | Andrea Adami <andrea.adami@gmail.com> | 2013-07-21 01:07:44 +0200 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org> | 2013-08-09 22:41:06 +0200 |
| commit | 1ba6411497589028ab9f90ed8438182e8506abbb (patch) | |
| tree | a4a5293077003bcd4dc6fcd9fac69c845476bd8b /drivers/power/collie_battery.c | |
| parent | power_supply: Make goldfish_battery depend on GOLDFISH || COMPILE_TEST (diff) | |
| download | linux-1ba6411497589028ab9f90ed8438182e8506abbb.tar.xz linux-1ba6411497589028ab9f90ed8438182e8506abbb.zip | |
power supply: collie_battery: Convert to use dev_pm_ops
This commit fixes the following warnings:
linux/drivers/power/collie_battery.c:372:2: warning: initialization from
incompatible pointer type [enabled by default]
linux/drivers/power/collie_battery.c:372:2: warning: (near initialization
for 'collie_bat_driver.suspend') [enabled by default]
Referencess:
MFD: ucb1x00-core: convert to use dev_pm_ops
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/include/linux/mfd?id=5a09b7120a965a7d7e8494d0ed509135bbce0118
MFD: mcp-core: remove legacy driver suspend/resume methods
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/include/linux/mfd?id=cf4abfcc0df2985ff6061f74e63b8353f2a1d0bc
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Diffstat (limited to 'drivers/power/collie_battery.c')
| -rw-r--r-- | drivers/power/collie_battery.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/collie_battery.c b/drivers/power/collie_battery.c index c58d0e31bdef..d02ae02a7590 100644 --- a/drivers/power/collie_battery.c +++ b/drivers/power/collie_battery.c @@ -287,7 +287,7 @@ static struct gpio collie_batt_gpios[] = { }; #ifdef CONFIG_PM -static int collie_bat_suspend(struct ucb1x00_dev *dev, pm_message_t state) +static int collie_bat_suspend(struct ucb1x00_dev *dev) { /* flush all pending status updates */ flush_work(&bat_work); |