diff options
| author | H. Nikolaus Schaller <hns@goldelico.com> | 2017-06-14 11:25:54 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2017-06-14 22:10:44 +0200 |
| commit | 5e6eb025b0d7ee721e8d88d632630ba43eeab50b (patch) | |
| tree | dd8904944dcb378f3bace82df60ff623720e6966 /drivers/power | |
| parent | power: supply: twl4030-charger: allocate iio by devm_iio_channel_get() and fi... (diff) | |
| download | linux-5e6eb025b0d7ee721e8d88d632630ba43eeab50b.tar.xz linux-5e6eb025b0d7ee721e8d88d632630ba43eeab50b.zip | |
power: supply: twl4030-charger: move allocation of iio channel to the 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>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/supply/twl4030_charger.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c index 33f2415680d9..3de802f169a1 100644 --- a/drivers/power/supply/twl4030_charger.c +++ b/drivers/power/supply/twl4030_charger.c @@ -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)) { @@ -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); |