summaryrefslogtreecommitdiffstats
path: root/drivers/power/ipaq_micro_battery.c
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>2015-03-12 08:44:02 +0100
committerSebastian Reichel <sre@kernel.org>2015-03-13 23:15:12 +0100
commit2dc9215d7c94f7f9f34ccf8b1710ad73d82f6216 (patch)
treeb8bae66b916e1f64dd725a68bca2182ee315bf66 /drivers/power/ipaq_micro_battery.c
parente44ea364394499d38a26ed4c9668fb378ae8797f (diff)
downloadblackbird-op-linux-2dc9215d7c94f7f9f34ccf8b1710ad73d82f6216.tar.gz
blackbird-op-linux-2dc9215d7c94f7f9f34ccf8b1710ad73d82f6216.zip
power_supply: Move run-time configuration to separate structure
Add new structure 'power_supply_config' for holding run-time initialization data like of_node, supplies and private driver data. The power_supply_register() function is changed so all power supply drivers need updating. When registering the power supply this new 'power_supply_config' should be used instead of directly initializing 'struct power_supply'. This allows changing the ownership of power_supply structure from driver to the power supply core in next patches. When a driver does not use of_node or supplies then it should use NULL as config. If driver uses of_node or supplies then it should allocate config on stack and initialize it with proper values. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Acked-by: Pavel Machek <pavel@ucw.cz> [for the nvec part] Reviewed-by: Marc Dietrich <marvin24@gmx.de> [for drivers/platform/x86/compal-laptop.c] Reviewed-by: Darren Hart <dvhart@linux.intel.com> [for drivers/hid/*] Reviewed-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/power/ipaq_micro_battery.c')
-rw-r--r--drivers/power/ipaq_micro_battery.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/ipaq_micro_battery.c b/drivers/power/ipaq_micro_battery.c
index 96b15e003f3f..842e7e2e1cb5 100644
--- a/drivers/power/ipaq_micro_battery.c
+++ b/drivers/power/ipaq_micro_battery.c
@@ -241,11 +241,11 @@ static int micro_batt_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, mb);
queue_delayed_work(mb->wq, &mb->update, 1);
- ret = power_supply_register(&pdev->dev, &micro_batt_power);
+ ret = power_supply_register(&pdev->dev, &micro_batt_power, NULL);
if (ret < 0)
goto batt_err;
- ret = power_supply_register(&pdev->dev, &micro_ac_power);
+ ret = power_supply_register(&pdev->dev, &micro_ac_power, NULL);
if (ret < 0)
goto ac_err;
OpenPOWER on IntegriCloud