[V4,11/17] i2c: nomadik: Convert to devm functions

Message ID 1392762022-10871-1-git-send-email-ulf.hansson@linaro.org
State New
Headers show

Commit Message

Ulf Hansson Feb. 18, 2014, 10:20 p.m.
Use devm_* functions to simplify code and error handling.

Cc: Alessandro Rubini <rubini@unipv.it>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---

Changes in v4:
	Rebased on top of Linus Walleij's v2 patch:
	"i2c: nomadik: factor platform data into state container"

	Note, only this patch needed to be rebased in the patchset.
	
---
 drivers/i2c/busses/i2c-nomadik.c |   36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

Comments

Ulf Hansson Feb. 18, 2014, 10:26 p.m. | #1
On 18 February 2014 23:20, Ulf Hansson <ulf.hansson@linaro.org> wrote:
> Use devm_* functions to simplify code and error handling.
>
> Cc: Alessandro Rubini <rubini@unipv.it>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Wolfram Sang <wsa@the-dreams.de>
> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
> ---
>
> Changes in v4:
>         Rebased on top of Linus Walleij's v2 patch:
>         "i2c: nomadik: factor platform data into state container"
>
>         Note, only this patch needed to be rebased in the patchset.
>
> ---
>  drivers/i2c/busses/i2c-nomadik.c |   36 +++++++++++++++---------------------
>  1 file changed, 15 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
> index b0b9390..cd15c03 100644
> --- a/drivers/i2c/busses/i2c-nomadik.c
> +++ b/drivers/i2c/busses/i2c-nomadik.c
> @@ -976,7 +976,12 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
>         struct i2c_vendor_data *vendor = id->data;
>         u32 max_fifo_threshold = (vendor->fifodepth / 2) - 1;
>
> -       dev = kzalloc(sizeof(struct nmk_i2c_dev), GFP_KERNEL);
> +       if (!np) {
> +               dev_err(&adev->dev, "no device node\n");
> +               return -ENODEV;
> +       }
> +

Argh, I managed to screw up again. The above code should not be there.
The rebase of Linus v2 failed.

Hold on, v5 coming soon. :-)

Kind regards
Uffe

> +       dev = devm_kzalloc(&adev->dev, sizeof(struct nmk_i2c_dev), GFP_KERNEL);
>         if (!dev) {
>                 dev_err(&adev->dev, "cannot allocate memory\n");
>                 ret = -ENOMEM;
> @@ -1006,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;
> @@ -1048,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;
> @@ -1079,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;
>  }
> --
> 1.7.9.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index b0b9390..cd15c03 100644
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -976,7 +976,12 @@  static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
 	struct i2c_vendor_data *vendor = id->data;
 	u32 max_fifo_threshold = (vendor->fifodepth / 2) - 1;
 
-	dev = kzalloc(sizeof(struct nmk_i2c_dev), GFP_KERNEL);
+	if (!np) {
+		dev_err(&adev->dev, "no device node\n");
+		return -ENODEV;
+	}
+
+	dev = devm_kzalloc(&adev->dev, sizeof(struct nmk_i2c_dev), GFP_KERNEL);
 	if (!dev) {
 		dev_err(&adev->dev, "cannot allocate memory\n");
 		ret = -ENOMEM;
@@ -1006,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;
@@ -1048,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;
@@ -1079,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;
 }