diff options
| author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2015-03-12 08:44:02 +0100 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2015-03-13 23:15:12 +0100 |
| commit | 2dc9215d7c94f7f9f34ccf8b1710ad73d82f6216 (patch) | |
| tree | b8bae66b916e1f64dd725a68bca2182ee315bf66 /drivers/power/sbs-battery.c | |
| parent | power_supply: Add driver private data (diff) | |
| download | linux-2dc9215d7c94f7f9f34ccf8b1710ad73d82f6216.tar.xz 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/sbs-battery.c')
| -rw-r--r-- | drivers/power/sbs-battery.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/power/sbs-battery.c b/drivers/power/sbs-battery.c index c7b7b4018df3..879f1448fc4a 100644 --- a/drivers/power/sbs-battery.c +++ b/drivers/power/sbs-battery.c @@ -801,6 +801,7 @@ static int sbs_probe(struct i2c_client *client, { struct sbs_info *chip; struct sbs_platform_data *pdata = client->dev.platform_data; + struct power_supply_config psy_cfg = {}; int rc; int irq; char *name; @@ -825,7 +826,7 @@ static int sbs_probe(struct i2c_client *client, chip->power_supply.properties = sbs_properties; chip->power_supply.num_properties = ARRAY_SIZE(sbs_properties); chip->power_supply.get_property = sbs_get_property; - chip->power_supply.of_node = client->dev.of_node; + psy_cfg.of_node = client->dev.of_node; /* ignore first notification of external change, it is generated * from the power_supply_register call back */ @@ -892,7 +893,8 @@ skip_gpio: goto exit_psupply; } - rc = power_supply_register(&client->dev, &chip->power_supply); + rc = power_supply_register(&client->dev, &chip->power_supply, + &psy_cfg); if (rc) { dev_err(&client->dev, "%s: Failed to register power supply\n", __func__); |