| Message ID | 0aa7052c6c8183ef12c08ed6aa069ddf8c748809.1497432355.git.hns@goldelico.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, On Wed, Jun 14, 2017 at 11:25:54AM +0200, H. Nikolaus Schaller wrote: > 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> Thanks, queued. -- Sebastian > drivers/power/supply/twl4030_charger.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c > index 9507c24495ba..1fbbe0cc216a 100644 > --- a/drivers/power/supply/twl4030_charger.c > +++ b/drivers/power/supply/twl4030_charger.c > @@ -984,6 +984,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)) { > @@ -1017,12 +1023,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); > > -- > 2.12.2 >
diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c index 9507c24495ba..1fbbe0cc216a 100644 --- a/drivers/power/supply/twl4030_charger.c +++ b/drivers/power/supply/twl4030_charger.c @@ -984,6 +984,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)) { @@ -1017,12 +1023,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);
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> --- drivers/power/supply/twl4030_charger.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)