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/hid/wacom_sys.c | |
| parent | e44ea364394499d38a26ed4c9668fb378ae8797f (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/hid/wacom_sys.c')
| -rw-r--r-- | drivers/hid/wacom_sys.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index f0568a7e6de9..148949c0e039 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -1021,13 +1021,14 @@ static int wacom_initialize_battery(struct wacom *wacom) wacom->ac.use_for_apm = 0; error = power_supply_register(&wacom->hdev->dev, - &wacom->battery); + &wacom->battery, NULL); if (error) return error; power_supply_powers(&wacom->battery, &wacom->hdev->dev); - error = power_supply_register(&wacom->hdev->dev, &wacom->ac); + error = power_supply_register(&wacom->hdev->dev, &wacom->ac, + NULL); if (error) { power_supply_unregister(&wacom->battery); return error; |