diff options
author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2015-03-12 03:44:02 -0400 |
---|---|---|
committer | Sebastian Reichel <sre@kernel.org> | 2015-03-13 18:15:12 -0400 |
commit | 2dc9215d7c94f7f9f34ccf8b1710ad73d82f6216 (patch) | |
tree | b8bae66b916e1f64dd725a68bca2182ee315bf66 /drivers/power/wm831x_power.c | |
parent | e44ea364394499d38a26ed4c9668fb378ae8797f (diff) |
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/wm831x_power.c')
-rw-r--r-- | drivers/power/wm831x_power.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/wm831x_power.c b/drivers/power/wm831x_power.c index 3bed2f55cf7d..a132aae6225d 100644 --- a/drivers/power/wm831x_power.c +++ b/drivers/power/wm831x_power.c | |||
@@ -536,7 +536,7 @@ static int wm831x_power_probe(struct platform_device *pdev) | |||
536 | wall->properties = wm831x_wall_props; | 536 | wall->properties = wm831x_wall_props; |
537 | wall->num_properties = ARRAY_SIZE(wm831x_wall_props); | 537 | wall->num_properties = ARRAY_SIZE(wm831x_wall_props); |
538 | wall->get_property = wm831x_wall_get_prop; | 538 | wall->get_property = wm831x_wall_get_prop; |
539 | ret = power_supply_register(&pdev->dev, wall); | 539 | ret = power_supply_register(&pdev->dev, wall, NULL); |
540 | if (ret) | 540 | if (ret) |
541 | goto err_kmalloc; | 541 | goto err_kmalloc; |
542 | 542 | ||
@@ -545,7 +545,7 @@ static int wm831x_power_probe(struct platform_device *pdev) | |||
545 | usb->properties = wm831x_usb_props; | 545 | usb->properties = wm831x_usb_props; |
546 | usb->num_properties = ARRAY_SIZE(wm831x_usb_props); | 546 | usb->num_properties = ARRAY_SIZE(wm831x_usb_props); |
547 | usb->get_property = wm831x_usb_get_prop; | 547 | usb->get_property = wm831x_usb_get_prop; |
548 | ret = power_supply_register(&pdev->dev, usb); | 548 | ret = power_supply_register(&pdev->dev, usb, NULL); |
549 | if (ret) | 549 | if (ret) |
550 | goto err_wall; | 550 | goto err_wall; |
551 | 551 | ||
@@ -560,7 +560,7 @@ static int wm831x_power_probe(struct platform_device *pdev) | |||
560 | battery->num_properties = ARRAY_SIZE(wm831x_bat_props); | 560 | battery->num_properties = ARRAY_SIZE(wm831x_bat_props); |
561 | battery->get_property = wm831x_bat_get_prop; | 561 | battery->get_property = wm831x_bat_get_prop; |
562 | battery->use_for_apm = 1; | 562 | battery->use_for_apm = 1; |
563 | ret = power_supply_register(&pdev->dev, battery); | 563 | ret = power_supply_register(&pdev->dev, battery, NULL); |
564 | if (ret) | 564 | if (ret) |
565 | goto err_usb; | 565 | goto err_usb; |
566 | } | 566 | } |