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, 5 insertions, 3 deletions

diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c
index 777324992c59..d2e88e473238 100644
--- a/drivers/power/pm2301_charger.c
+++ b/drivers/power/pm2301_charger.c
@@ -989,6 +989,7 @@ static int pm2xxx_wall_charger_probe(struct i2c_client *i2c_client,
                 const struct i2c_device_id *id)
 {
         struct pm2xxx_platform_data *pl_data = i2c_client->dev.platform_data;
+        struct power_supply_config psy_cfg = {};
         struct pm2xxx_charger *pm2;
         int ret = 0;
         u8 val;
@@ -1047,8 +1048,9 @@ static int pm2xxx_wall_charger_probe(struct i2c_client *i2c_client,
         pm2->ac_chg.psy.properties = pm2xxx_charger_ac_props;
         pm2->ac_chg.psy.num_properties = ARRAY_SIZE(pm2xxx_charger_ac_props);
         pm2->ac_chg.psy.get_property = pm2xxx_charger_ac_get_property;
-        pm2->ac_chg.psy.supplied_to = pm2->pdata->supplied_to;
-        pm2->ac_chg.psy.num_supplicants = pm2->pdata->num_supplicants;
+
+        psy_cfg.supplied_to = pm2->pdata->supplied_to;
+        psy_cfg.num_supplicants = pm2->pdata->num_supplicants;
         /* pm2xxx_charger sub-class */
         pm2->ac_chg.ops.enable = &pm2xxx_charger_ac_en;
         pm2->ac_chg.ops.kick_wd = &pm2xxx_charger_watchdog_kick;
@@ -1093,7 +1095,7 @@ static int pm2xxx_wall_charger_probe(struct i2c_client *i2c_client,
         }
 
         /* Register AC charger class */
-        ret = power_supply_register(pm2->dev, &pm2->ac_chg.psy);
+        ret = power_supply_register(pm2->dev, &pm2->ac_chg.psy, &psy_cfg);
         if (ret) {
                 dev_err(pm2->dev, "failed to register AC charger\n");
                 goto free_regulator;