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>

diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c
index 33f2415680d9832053efdda97acd13d5fce5f4a0..3de802f169a162ceaa4644f26d979837e2e00841 100644 (file)
--- 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);