Skip to content

Commit

Permalink
power: supply: twl4030-charger: move allocation of iio channel to the…
Browse files Browse the repository at this point in the history
… beginning

This is in prepraration for EPROBE_DEFER handling because it is quite
likely that geting the (madc) iio channel is deferred more often than
later steps.

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
  • Loading branch information
goldelico authored and sre committed Jun 14, 2017
1 parent e8847c5 commit 5e6eb02
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/power/supply/twl4030_charger.c
Original file line number Diff line number Diff line change
Expand Up @@ -980,6 +980,12 @@ static int twl4030_bci_probe(struct platform_device *pdev)

platform_set_drvdata(pdev, bci);

bci->channel_vac = devm_iio_channel_get(&pdev->dev, "vac");
if (IS_ERR(bci->channel_vac)) {
bci->channel_vac = NULL;
dev_warn(&pdev->dev, "could not request vac iio channel");
}

bci->ac = devm_power_supply_register(&pdev->dev, &twl4030_bci_ac_desc,
NULL);
if (IS_ERR(bci->ac)) {
Expand Down Expand Up @@ -1013,12 +1019,6 @@ static int twl4030_bci_probe(struct platform_device *pdev)
return ret;
}

bci->channel_vac = devm_iio_channel_get(&pdev->dev, "vac");
if (IS_ERR(bci->channel_vac)) {
bci->channel_vac = NULL;
dev_warn(&pdev->dev, "could not request vac iio channel");
}

INIT_WORK(&bci->work, twl4030_bci_usb_work);
INIT_DELAYED_WORK(&bci->current_worker, twl4030_current_worker);

Expand Down

0 comments on commit 5e6eb02

Please sign in to comment.