aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power/wm8350_power.c
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>2015-03-12 03:44:02 -0400
committerSebastian Reichel <sre@kernel.org>2015-03-13 18:15:12 -0400
commit2dc9215d7c94f7f9f34ccf8b1710ad73d82f6216 (patch)
treeb8bae66b916e1f64dd725a68bca2182ee315bf66 /drivers/power/wm8350_power.c
parente44ea364394499d38a26ed4c9668fb378ae8797f (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/wm8350_power.c')
-rw-r--r--drivers/power/wm8350_power.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/wm8350_power.c b/drivers/power/wm8350_power.c
index b3607e2906d2..261ceca561d5 100644
--- a/drivers/power/wm8350_power.c
+++ b/drivers/power/wm8350_power.c
@@ -457,7 +457,7 @@ static int wm8350_power_probe(struct platform_device *pdev)
457 ac->properties = wm8350_ac_props; 457 ac->properties = wm8350_ac_props;
458 ac->num_properties = ARRAY_SIZE(wm8350_ac_props); 458 ac->num_properties = ARRAY_SIZE(wm8350_ac_props);
459 ac->get_property = wm8350_ac_get_prop; 459 ac->get_property = wm8350_ac_get_prop;
460 ret = power_supply_register(&pdev->dev, ac); 460 ret = power_supply_register(&pdev->dev, ac, NULL);
461 if (ret) 461 if (ret)
462 return ret; 462 return ret;
463 463
@@ -466,7 +466,7 @@ static int wm8350_power_probe(struct platform_device *pdev)
466 battery->num_properties = ARRAY_SIZE(wm8350_bat_props); 466 battery->num_properties = ARRAY_SIZE(wm8350_bat_props);
467 battery->get_property = wm8350_bat_get_property; 467 battery->get_property = wm8350_bat_get_property;
468 battery->use_for_apm = 1; 468 battery->use_for_apm = 1;
469 ret = power_supply_register(&pdev->dev, battery); 469 ret = power_supply_register(&pdev->dev, battery, NULL);
470 if (ret) 470 if (ret)
471 goto battery_failed; 471 goto battery_failed;
472 472
@@ -475,7 +475,7 @@ static int wm8350_power_probe(struct platform_device *pdev)
475 usb->properties = wm8350_usb_props; 475 usb->properties = wm8350_usb_props;
476 usb->num_properties = ARRAY_SIZE(wm8350_usb_props); 476 usb->num_properties = ARRAY_SIZE(wm8350_usb_props);
477 usb->get_property = wm8350_usb_get_prop; 477 usb->get_property = wm8350_usb_get_prop;
478 ret = power_supply_register(&pdev->dev, usb); 478 ret = power_supply_register(&pdev->dev, usb, NULL);
479 if (ret) 479 if (ret)
480 goto usb_failed; 480 goto usb_failed;
481 481