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>

1 files changed, 16 insertions, 5 deletions

diff --git a/drivers/power/test_power.c b/drivers/power/test_power.c
index f26b1fa00fe1..f6c92d1d7811 100644
--- a/drivers/power/test_power.c
+++ b/drivers/power/test_power.c
@@ -157,8 +157,6 @@ static struct power_supply test_power_supplies[] = {
         [TEST_AC] = {
                 .name = "test_ac",
                 .type = POWER_SUPPLY_TYPE_MAINS,
-                .supplied_to = test_power_ac_supplied_to,
-                .num_supplicants = ARRAY_SIZE(test_power_ac_supplied_to),
                 .properties = test_power_ac_props,
                 .num_properties = ARRAY_SIZE(test_power_ac_props),
                 .get_property = test_power_get_ac_property,
@@ -173,14 +171,25 @@ static struct power_supply test_power_supplies[] = {
         [TEST_USB] = {
                 .name = "test_usb",
                 .type = POWER_SUPPLY_TYPE_USB,
-                .supplied_to = test_power_ac_supplied_to,
-                .num_supplicants = ARRAY_SIZE(test_power_ac_supplied_to),
                 .properties = test_power_ac_props,
                 .num_properties = ARRAY_SIZE(test_power_ac_props),
                 .get_property = test_power_get_usb_property,
         },
 };
 
+static const struct power_supply_config test_power_configs[] = {
+        {
+                /* test_ac */
+                .supplied_to = test_power_ac_supplied_to,
+                .num_supplicants = ARRAY_SIZE(test_power_ac_supplied_to),
+        }, {
+                /* test_battery */
+        }, {
+                /* test_usb */
+                .supplied_to = test_power_ac_supplied_to,
+                .num_supplicants = ARRAY_SIZE(test_power_ac_supplied_to),
+        },
+};
 
 static int __init test_power_init(void)
 {
@@ -188,9 +197,11 @@ static int __init test_power_init(void)
         int ret;
 
         BUILD_BUG_ON(TEST_POWER_NUM != ARRAY_SIZE(test_power_supplies));
+        BUILD_BUG_ON(TEST_POWER_NUM != ARRAY_SIZE(test_power_configs));
 
         for (i = 0; i < ARRAY_SIZE(test_power_supplies); i++) {
-                ret = power_supply_register(NULL, &test_power_supplies[i]);
+                ret = power_supply_register(NULL, &test_power_supplies[i],
+                                                &test_power_configs[i]);
                 if (ret) {
                         pr_err("%s: failed to register %s\n", __func__,
                                 test_power_supplies[i].name);