Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1665621

[PATCH v6 1/4] power: supply: twl4030-charger: allocate iio by devm_iio_channel_get() and fix error path

Show all headers | View raw

Suggested-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
 drivers/power/supply/twl4030_charger.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c
index 785a07bc4f39..9507c24495ba 100644
--- a/drivers/power/supply/twl4030_charger.c
+++ b/drivers/power/supply/twl4030_charger.c
@@ -1017,7 +1017,7 @@ static int twl4030_bci_probe(struct platform_device *pdev)
 		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)) {
 		bci->channel_vac = NULL;
 		dev_warn(&pdev->dev, "could not request vac iio channel");
@@ -1044,7 +1044,7 @@ static int twl4030_bci_probe(struct platform_device *pdev)
 			       TWL4030_INTERRUPTS_BCIIMR1A);
 	if (ret < 0) {
 		dev_err(&pdev->dev, "failed to unmask interrupts: %d\n", ret);
-		goto fail;
+		return ret;
 	}
 
 	reg = ~(u32)(TWL4030_VBATOV | TWL4030_VBUSOV | TWL4030_ACCHGOV);
@@ -1073,10 +1073,6 @@ static int twl4030_bci_probe(struct platform_device *pdev)
 		twl4030_charger_enable_backup(0, 0);
 
 	return 0;
-fail:
-	iio_channel_release(bci->channel_vac);
-
-	return ret;
 }
 
 static int twl4030_bci_remove(struct platform_device *pdev)
@@ -1087,8 +1083,6 @@ static int twl4030_bci_remove(struct platform_device *pdev)
 	twl4030_charger_enable_usb(bci, false);
 	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->ac->dev, &dev_attr_mode);
 	/* mask interrupts */
-- 
2.12.2

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v6 0/4] More fixes for twl4030 charger "H. Nikolaus Schaller" <hns@goldelico.com> - 2017-06-14 11:30 +0200
  [PATCH v6 2/4] power: supply: twl4030-charger: move allocation of iio channel to the beginning "H. Nikolaus Schaller" <hns@goldelico.com> - 2017-06-14 11:30 +0200
    Re: [PATCH v6 2/4] power: supply: twl4030-charger: move allocation  of iio channel to the beginning Sebastian Reichel <sre@kernel.org> - 2017-06-14 22:20 +0200
  [PATCH v6 1/4] power: supply: twl4030-charger: allocate iio by devm_iio_channel_get() and fix error path "H. Nikolaus Schaller" <hns@goldelico.com> - 2017-06-14 11:30 +0200
    Re: [PATCH v6 1/4] power: supply: twl4030-charger: allocate iio by  devm_iio_channel_get() and fix error path Sebastian Reichel <sre@kernel.org> - 2017-06-14 22:20 +0200
  [PATCH v6 3/4] power: supply: twl4030-charger: move irq allocation to just before irqs are enabled "H. Nikolaus Schaller" <hns@goldelico.com> - 2017-06-14 11:30 +0200
    Re: [PATCH v6 3/4] power: supply: twl4030-charger: move irq  allocation to just before irqs are enabled Sebastian Reichel <sebastian.reichel@collabora.co.uk> - 2017-06-15 13:50 +0200
  Re: [PATCH v6 0/4] More fixes for twl4030 charger "H. Nikolaus Schaller" <hns@goldelico.com> - 2017-06-14 11:40 +0200

csiph-web