Commit e8847c56 authored by H. Nikolaus Schaller's avatar H. Nikolaus Schaller Committed by Sebastian Reichel

power: supply: twl4030-charger: allocate iio by devm_iio_channel_get() and fix error path

Suggested-by: default avatarSebastian Reichel <sre@kernel.org>
Signed-off-by: default avatarH. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
parent 355679b2
...@@ -1013,7 +1013,7 @@ static int twl4030_bci_probe(struct platform_device *pdev) ...@@ -1013,7 +1013,7 @@ static int twl4030_bci_probe(struct platform_device *pdev)
return ret; return ret;
} }
bci->channel_vac = iio_channel_get(&pdev->dev, "vac"); bci->channel_vac = devm_iio_channel_get(&pdev->dev, "vac");
if (IS_ERR(bci->channel_vac)) { if (IS_ERR(bci->channel_vac)) {
bci->channel_vac = NULL; bci->channel_vac = NULL;
dev_warn(&pdev->dev, "could not request vac iio channel"); dev_warn(&pdev->dev, "could not request vac iio channel");
...@@ -1040,7 +1040,7 @@ static int twl4030_bci_probe(struct platform_device *pdev) ...@@ -1040,7 +1040,7 @@ static int twl4030_bci_probe(struct platform_device *pdev)
TWL4030_INTERRUPTS_BCIIMR1A); TWL4030_INTERRUPTS_BCIIMR1A);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "failed to unmask interrupts: %d\n", ret); dev_err(&pdev->dev, "failed to unmask interrupts: %d\n", ret);
goto fail; return ret;
} }
reg = ~(u32)(TWL4030_VBATOV | TWL4030_VBUSOV | TWL4030_ACCHGOV); reg = ~(u32)(TWL4030_VBATOV | TWL4030_VBUSOV | TWL4030_ACCHGOV);
...@@ -1069,10 +1069,6 @@ static int twl4030_bci_probe(struct platform_device *pdev) ...@@ -1069,10 +1069,6 @@ static int twl4030_bci_probe(struct platform_device *pdev)
twl4030_charger_enable_backup(0, 0); twl4030_charger_enable_backup(0, 0);
return 0; return 0;
fail:
iio_channel_release(bci->channel_vac);
return ret;
} }
static int twl4030_bci_remove(struct platform_device *pdev) static int twl4030_bci_remove(struct platform_device *pdev)
...@@ -1083,8 +1079,6 @@ static int twl4030_bci_remove(struct platform_device *pdev) ...@@ -1083,8 +1079,6 @@ static int twl4030_bci_remove(struct platform_device *pdev)
twl4030_charger_enable_usb(bci, false); twl4030_charger_enable_usb(bci, false);
twl4030_charger_enable_backup(0, 0); twl4030_charger_enable_backup(0, 0);
iio_channel_release(bci->channel_vac);
device_remove_file(&bci->usb->dev, &dev_attr_mode); device_remove_file(&bci->usb->dev, &dev_attr_mode);
device_remove_file(&bci->ac->dev, &dev_attr_mode); device_remove_file(&bci->ac->dev, &dev_attr_mode);
/* mask interrupts */ /* mask interrupts */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment