aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power/tps65090-charger.c
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>2015-03-12 03:44:02 -0400
committerSebastian Reichel <sre@kernel.org>2015-03-13 18:15:12 -0400
commit2dc9215d7c94f7f9f34ccf8b1710ad73d82f6216 (patch)
treeb8bae66b916e1f64dd725a68bca2182ee315bf66 /drivers/power/tps65090-charger.c
parente44ea364394499d38a26ed4c9668fb378ae8797f (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/power/tps65090-charger.c')
-rw-r--r--drivers/power/tps65090-charger.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/power/tps65090-charger.c b/drivers/power/tps65090-charger.c
index 0f4e5971dff5..9872c901bd70 100644
--- a/drivers/power/tps65090-charger.c
+++ b/drivers/power/tps65090-charger.c
@@ -233,6 +233,7 @@ static int tps65090_charger_probe(struct platform_device *pdev)
233{ 233{
234 struct tps65090_charger *cdata; 234 struct tps65090_charger *cdata;
235 struct tps65090_platform_data *pdata; 235 struct tps65090_platform_data *pdata;
236 struct power_supply_config psy_cfg = {};
236 uint8_t status1 = 0; 237 uint8_t status1 = 0;
237 int ret; 238 int ret;
238 int irq; 239 int irq;
@@ -264,11 +265,12 @@ static int tps65090_charger_probe(struct platform_device *pdev)
264 cdata->ac.get_property = tps65090_ac_get_property; 265 cdata->ac.get_property = tps65090_ac_get_property;
265 cdata->ac.properties = tps65090_ac_props; 266 cdata->ac.properties = tps65090_ac_props;
266 cdata->ac.num_properties = ARRAY_SIZE(tps65090_ac_props); 267 cdata->ac.num_properties = ARRAY_SIZE(tps65090_ac_props);
267 cdata->ac.supplied_to = pdata->supplied_to;
268 cdata->ac.num_supplicants = pdata->num_supplicants;
269 cdata->ac.of_node = pdev->dev.of_node;
270 268
271 ret = power_supply_register(&pdev->dev, &cdata->ac); 269 psy_cfg.supplied_to = pdata->supplied_to;
270 psy_cfg.num_supplicants = pdata->num_supplicants;
271 psy_cfg.of_node = pdev->dev.of_node;
272
273 ret = power_supply_register(&pdev->dev, &cdata->ac, &psy_cfg);
272 if (ret) { 274 if (ret) {
273 dev_err(&pdev->dev, "failed: power supply register\n"); 275 dev_err(&pdev->dev, "failed: power supply register\n");
274 return ret; 276 return ret;