Skip to contentSkip to conversation

i2c: nomadik: Convert to devm functions

PATCH Superseded Ulf Hansson 2 participants 6 messages Feb 17, 2014 – Feb 18, 2014

Subsystems (2)

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 11/17 i2c: nomadik: Convert to devm functions

Use devm_* functions to simplify code and error handling.

Cc Alessandro Rubini <[email protected]>
Cc Linus Walleij <[email protected]>
Cc Wolfram Sang <[email protected]>
---
 drivers/i2c/busses/i2c-nomadik.c |   31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)
drivers/i2c/busses/i2c-nomadik.c +10 -21
index bc8ba02..cd15c03 100644
@@ -981,7 +981,7 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
 		return -ENODEV;
 	}
 
-	dev = kzalloc(sizeof(struct nmk_i2c_dev), GFP_KERNEL);
+	dev = devm_kzalloc(&adev->dev, sizeof(struct nmk_i2c_dev), GFP_KERNEL);
 	if (!dev) {
 		dev_err(&adev->dev, "cannot allocate memory\n");
 		ret = -ENOMEM;
@@ -1011,27 +1011,28 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
 	/* If possible, let's go to idle until the first transfer */
 	pinctrl_pm_select_idle_state(&adev->dev);
 
-	dev->virtbase = ioremap(adev->res.start, resource_size(&adev->res));
-	if (!dev->virtbase) {
+	dev->virtbase = devm_ioremap(&adev->dev, adev->res.start,
+				resource_size(&adev->res));
+	if (IS_ERR(dev->virtbase)) {
 		ret = -ENOMEM;
-		goto err_no_ioremap;
+		goto err_no_mem;
 	}
 
 	dev->irq = adev->irq[0];
-	ret = request_irq(dev->irq, i2c_irq_handler, 0,
+	ret = devm_request_irq(&adev->dev, dev->irq, i2c_irq_handler, 0,
 				DRIVER_NAME, dev);
 	if (ret) {
 		dev_err(&adev->dev, "cannot claim the irq %d\n", dev->irq);
-		goto err_irq;
+		goto err_no_mem;
 	}
 
 	pm_suspend_ignore_children(&adev->dev, true);
 
-	dev->clk = clk_get(&adev->dev, NULL);
+	dev->clk = devm_clk_get(&adev->dev, NULL);
 	if (IS_ERR(dev->clk)) {
 		dev_err(&adev->dev, "could not get i2c clock\n");
 		ret = PTR_ERR(dev->clk);
-		goto err_no_clk;
+		goto err_no_mem;
 	}
 
 	adap = &dev->adap;
@@ -1053,21 +1054,13 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
 	ret = i2c_add_adapter(adap);
 	if (ret) {
 		dev_err(&adev->dev, "failed to add adapter\n");
-		goto err_add_adap;
+		goto err_no_mem;
 	}
 
 	pm_runtime_put(&adev->dev);
 
 	return 0;
 
- err_add_adap:
-	clk_put(dev->clk);
- err_no_clk:
-	free_irq(dev->irq, dev);
- err_irq:
-	iounmap(dev->virtbase);
- err_no_ioremap:
-	kfree(dev);
  err_no_mem:
 
 	return ret;
@@ -1084,13 +1077,9 @@ static int nmk_i2c_remove(struct amba_device *adev)
 	clear_all_interrupts(dev);
 	/* disable the controller */
 	i2c_clr_bit(dev->virtbase + I2C_CR, I2C_CR_PE);
-	free_irq(dev->irq, dev);
-	iounmap(dev->virtbase);
 	if (res)
 		release_mem_region(res->start, resource_size(res));
-	clk_put(dev->clk);
 	pm_runtime_disable(&adev->dev);
-	kfree(dev);
 
 	return 0;
 }
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v3 11/17 i2c: nomadik: Convert to devm functions

Quoted 6 lines · Ulf Hansson

Use devm_* functions to simplify code and error handling.

Cc Alessandro Rubini <[email protected]>
Cc Linus Walleij <[email protected]>
Cc Wolfram Sang <[email protected]>

What has changed in V3? I didn't get the cover letter.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140218/6f835995/attachment.sig>

#2 lore raw

PATCH v3 11/17 i2c: nomadik: Convert to devm functions

Quoted 9 lines · Wolfram Sang
Quoted 6 lines · Ulf Hansson

Use devm_* functions to simplify code and error handling.

Cc Alessandro Rubini <[email protected]>
Cc Linus Walleij <[email protected]>
Cc Wolfram Sang <[email protected]>

What has changed in V3? I didn't get the cover letter.

I added the IS_ERR, check as you suggested. That caused a rebase of the other patches as well.

Sorry if it was unclear.

Kind regards
Uffe

#3 lore raw

PATCH v3 11/17 i2c: nomadik: Convert to devm functions

Quoted 5 lines

I added the IS_ERR, check as you suggested. That caused a rebase of the other patches as well.

Sorry if it was unclear.

No problem. I am about to apply all patches except 17 as you suggested. It fails here, however, although I applied Linus' patch first. What exactly is your base? Any chance to publish your branch?

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140218/a90a39ec/attachment.sig>

#4 lore raw

PATCH v3 11/17 i2c: nomadik: Convert to devm functions

Quoted 10 lines · Wolfram Sang
Quoted 5 lines

I added the IS_ERR, check as you suggested. That caused a rebase of the other patches as well.

Sorry if it was unclear.

No problem. I am about to apply all patches except 17 as you suggested. It fails here, however, although I applied Linus' patch first. What exactly is your base? Any chance to publish your branch?

I have several branches. :-)

My patches applies on top 3.14-rc1 + Linus' patch.

It also applies on "git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git" on the i2c-nomadik, which already holds Linus's patch. This is what I thought was important due what's stated in the MAINATAINERS file.

Now, I guess I should use your tree instead, "git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git". Any particular branch I should use? Maybe it's also better if I just resend the patches in a new patchset, once I rebased them towards your tree?

Kind regards
Uffe

#5 lore raw

PATCH v3 11/17 i2c: nomadik: Convert to devm functions

Quoted 21 lines · Ulf Hansson
Quoted 10 lines · Wolfram Sang
Quoted 5 lines

I added the IS_ERR, check as you suggested. That caused a rebase of the other patches as well.

Sorry if it was unclear.

No problem. I am about to apply all patches except 17 as you suggested. It fails here, however, although I applied Linus' patch first. What exactly is your base? Any chance to publish your branch?

I have several branches. :-)

My patches applies on top 3.14-rc1 + Linus' patch.

It also applies on "git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git" on the i2c-nomadik, which already holds Linus's patch. This is what I thought was important due what's stated in the MAINATAINERS file.

Quoted 5 lines

Now, I guess I should use your tree instead, "git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git". Any particular branch I should use? Maybe it's also better if I just resend the patches in a new patchset, once I rebased them towards your tree?

Sorry, I have taken Linus v1 patch as base, it should have been v2 of course. Sorry for wasting your time.

I will rebase and send v4 patches asap.

Kind regards
Uffe

Quoted 3 lines

Kind regards
Uffe