diff options
| author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2015-03-12 10:44:02 +0300 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2015-03-14 01:15:12 +0300 |
| commit | 2dc9215d7c94f7f9f34ccf8b1710ad73d82f6216 (patch) | |
| tree | b8bae66b916e1f64dd725a68bca2182ee315bf66 /drivers/power/s3c_adc_battery.c | |
| parent | e44ea364394499d38a26ed4c9668fb378ae8797f (diff) | |
| download | linux-2dc9215d7c94f7f9f34ccf8b1710ad73d82f6216.tar.xz | |
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/s3c_adc_battery.c')
| -rw-r--r-- | drivers/power/s3c_adc_battery.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/s3c_adc_battery.c b/drivers/power/s3c_adc_battery.c index 5948ce058bdd..b6ff213373dd 100644 --- a/drivers/power/s3c_adc_battery.c +++ b/drivers/power/s3c_adc_battery.c @@ -310,14 +310,14 @@ static int s3c_adc_bat_probe(struct platform_device *pdev) main_bat.cable_plugged = 0; main_bat.status = POWER_SUPPLY_STATUS_DISCHARGING; - ret = power_supply_register(&pdev->dev, &main_bat.psy); + ret = power_supply_register(&pdev->dev, &main_bat.psy, NULL); if (ret) goto err_reg_main; if (pdata->backup_volt_mult) { backup_bat.client = client; backup_bat.pdata = pdev->dev.platform_data; backup_bat.volt_value = -1; - ret = power_supply_register(&pdev->dev, &backup_bat.psy); + ret = power_supply_register(&pdev->dev, &backup_bat.psy, NULL); if (ret) goto err_reg_backup; } |