Skip to contentSkip to conversation

power supply: collie_battery: convert to use dev_pm_ops

PATCH Applied Andrea Adami 2 participants 2 messages Jul 20, 2013 – Aug 9, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 power supply: collie_battery: convert to use dev_pm_ops

Fix
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

---
 drivers/power/collie_battery.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/collie_battery.c +1 -1
index c58d0e3..d02ae02 100644
@@ -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);
Signature · 1 line
1.8.1.5
#1 lore raw
Quoted 10 lines · Andrea Adami

Fix
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

Quoted 5 lines

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

---

Applied. Thanks a lot, Andrea!

Quoted 18 lines
 drivers/power/collie_battery.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/collie_battery.c +1 -1
index c58d0e3..d02ae02 100644
@@ -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);
Signature · 1 line
1.8.1.5