Skip to contentSkip to conversation

i2c: bfin: turn to Resource-managed API in probe function

PATCH Superseded Sonic Zhang 2 participants 4 messages Mar 10, 2014 – May 22, 2014 1 message not in the archive I2C subsystem host drivers

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 i2c: bfin: turn to Resource-managed API in probe function

From: Sonic Zhang <[email protected]>

No need to free managed resources any more.

---
 drivers/i2c/busses/i2c-bfin-twi.c | 40 +++++++++++++--------------------------
 1 file changed, 13 insertions(+), 27 deletions(-)
drivers/i2c/busses/i2c-bfin-twi.c +13 -27
index 3b9bd9a..a5630c6 100644
@@ -633,11 +633,11 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
 	int rc;
 	unsigned int clkhilow;
 
-	iface = kzalloc(sizeof(struct bfin_twi_iface), GFP_KERNEL);
+	iface = devm_kzalloc(&pdev->dev, sizeof(struct bfin_twi_iface),
+			GFP_KERNEL);
 	if (!iface) {
 		dev_err(&pdev->dev, "Cannot allocate memory\n");
-		rc = -ENOMEM;
-		goto out_error_nomem;
+		return -ENOMEM;
 	}
 
 	spin_lock_init(&(iface->lock));
@@ -646,22 +646,19 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (res == NULL) {
 		dev_err(&pdev->dev, "Cannot get IORESOURCE_MEM\n");
-		rc = -ENOENT;
-		goto out_error_get_res;
+		return -ENOENT;
 	}
 
-	iface->regs_base = ioremap(res->start, resource_size(res));
-	if (iface->regs_base == NULL) {
+	iface->regs_base = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR((void *)iface->regs_base)) {
 		dev_err(&pdev->dev, "Cannot map IO\n");
-		rc = -ENXIO;
-		goto out_error_ioremap;
+		return PTR_ERR((void *)iface->regs_base);
 	}
 
 	iface->irq = platform_get_irq(pdev, 0);
 	if (iface->irq < 0) {
 		dev_err(&pdev->dev, "No IRQ specified\n");
-		rc = -ENOENT;
-		goto out_error_no_irq;
+		return -ENOENT;
 	}
 
 	p_adap = &iface->adap;
@@ -679,15 +676,15 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
 			"i2c-bfin-twi");
 	if (rc) {
 		dev_err(&pdev->dev, "Can't setup pin mux!\n");
-		goto out_error_pin_mux;
+		return -EBUSY;
 	}
 
-	rc = request_irq(iface->irq, bfin_twi_interrupt_entry,
+	rc = devm_request_irq(&pdev->dev, iface->irq, bfin_twi_interrupt_entry,
 		0, pdev->name, iface);
 	if (rc) {
 		dev_err(&pdev->dev, "Can't get IRQ %d !\n", iface->irq);
 		rc = -ENODEV;
-		goto out_error_req_irq;
+		goto out_error;
 	}
 
 	/* Set TWI internal clock as 10MHz */
@@ -709,7 +706,7 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
 	rc = i2c_add_numbered_adapter(p_adap);
 	if (rc < 0) {
 		dev_err(&pdev->dev, "Can't add i2c adapter!\n");
-		goto out_error_add_adapter;
+		goto out_error;
 	}
 
 	platform_set_drvdata(pdev, iface);
@@ -719,17 +716,8 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
 
 	return 0;
 
-out_error_add_adapter:
-	free_irq(iface->irq, iface);
-out_error_req_irq:
-out_error_no_irq:
+out_error:
 	peripheral_free_list(dev_get_platdata(&pdev->dev));
-out_error_pin_mux:
-	iounmap(iface->regs_base);
-out_error_ioremap:
-out_error_get_res:
-	kfree(iface);
-out_error_nomem:
 	return rc;
 }
 
@@ -740,8 +728,6 @@ static int i2c_bfin_twi_remove(struct platform_device *pdev)
 	i2c_del_adapter(&(iface->adap));
 	free_irq(iface->irq, iface);
 	peripheral_free_list(dev_get_platdata(&pdev->dev));
-	iounmap(iface->regs_base);
-	kfree(iface);
 
 	return 0;
 }
Signature · 1 line
1.8.2.3

A message that is not in the archive (sent off-list or not yet received): 1394445784-4653-1-git-send-email-sonic.adi-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

#2 lore raw

PING

Quoted 120 lines · Sonic Zhang

From: Sonic Zhang <[email protected]>

No need to free managed resources any more.

---
 drivers/i2c/busses/i2c-bfin-twi.c | 40 +++++++++++++--------------------------
 1 file changed, 13 insertions(+), 27 deletions(-)
drivers/i2c/busses/i2c-bfin-twi.c +13 -28
index 3b9bd9a..a5630c6 100644
@@ -633,11 +633,11 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
        int rc;
        unsigned int clkhilow;
 
-       iface = kzalloc(sizeof(struct bfin_twi_iface), GFP_KERNEL);
+       iface = devm_kzalloc(&pdev->dev, sizeof(struct bfin_twi_iface),
+                       GFP_KERNEL);
        if (!iface) {
                dev_err(&pdev->dev, "Cannot allocate memory\n");
-               rc = -ENOMEM;
-               goto out_error_nomem;
+               return -ENOMEM;
        }
 
        spin_lock_init(&(iface->lock));
@@ -646,22 +646,19 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (res == NULL) {
                dev_err(&pdev->dev, "Cannot get IORESOURCE_MEM\n");
-               rc = -ENOENT;
-               goto out_error_get_res;
+               return -ENOENT;
        }
 
-       iface->regs_base = ioremap(res->start, resource_size(res));
-       if (iface->regs_base == NULL) {
+       iface->regs_base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR((void *)iface->regs_base)) {
                dev_err(&pdev->dev, "Cannot map IO\n");
-               rc = -ENXIO;
-               goto out_error_ioremap;
+               return PTR_ERR((void *)iface->regs_base);
        }
 
        iface->irq = platform_get_irq(pdev, 0);
        if (iface->irq < 0) {
                dev_err(&pdev->dev, "No IRQ specified\n");
-               rc = -ENOENT;
-               goto out_error_no_irq;
+               return -ENOENT;
        }
 
        p_adap = &iface->adap;
@@ -679,15 +676,15 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
                        "i2c-bfin-twi");
        if (rc) {
                dev_err(&pdev->dev, "Can't setup pin mux!\n");
-               goto out_error_pin_mux;
+               return -EBUSY;
        }
 
-       rc = request_irq(iface->irq, bfin_twi_interrupt_entry,
+       rc = devm_request_irq(&pdev->dev, iface->irq, bfin_twi_interrupt_entry,
                0, pdev->name, iface);
        if (rc) {
                dev_err(&pdev->dev, "Can't get IRQ %d !\n", iface->irq);
                rc = -ENODEV;
-               goto out_error_req_irq;
+               goto out_error;
        }
 
        /* Set TWI internal clock as 10MHz */
@@ -709,7 +706,7 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
        rc = i2c_add_numbered_adapter(p_adap);
        if (rc < 0) {
                dev_err(&pdev->dev, "Can't add i2c adapter!\n");
-               goto out_error_add_adapter;
+               goto out_error;
        }
 
        platform_set_drvdata(pdev, iface);
@@ -719,17 +716,8 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
 
        return 0;
 
-out_error_add_adapter:
-       free_irq(iface->irq, iface);
-out_error_req_irq:
-out_error_no_irq:
+out_error:
        peripheral_free_list(dev_get_platdata(&pdev->dev));
-out_error_pin_mux:
-       iounmap(iface->regs_base);
-out_error_ioremap:
-out_error_get_res:
-       kfree(iface);
-out_error_nomem:
        return rc;
 }
 
@@ -740,8 +728,6 @@ static int i2c_bfin_twi_remove(struct platform_device *pdev)
        i2c_del_adapter(&(iface->adap));
        free_irq(iface->irq, iface);
        peripheral_free_list(dev_get_platdata(&pdev->dev));
-       iounmap(iface->regs_base);
-       kfree(iface);
 
        return 0;
 }
--

1.8.2.3

--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#3 lore raw
In reply to a message not in the archive

drivers/i2c/busses/i2c-bfin-twi.c static int i2c_bfin_twi_probe(struct platform_device *pdev) · line 649

Quoted 8 lines
drivers/i2c/busses/i2c-bfin-twi.c +1 -2
@@ -646,22 +646,19 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (res == NULL) {
 		dev_err(&pdev->dev, "Cannot get IORESOURCE_MEM\n");
-		rc = -ENOENT;
-		goto out_error_get_res;
+		return -ENOENT;

You don't need to check the resource. devm_ioremap_resource will do it.

drivers/i2c/busses/i2c-bfin-twi.c static int i2c_bfin_twi_probe(struct platform_device *pdev) · line 655

Quoted 8 lines
drivers/i2c/busses/i2c-bfin-twi.c +3 -4
-	iface->regs_base = ioremap(res->start, resource_size(res));
-	if (iface->regs_base == NULL) {
+	iface->regs_base = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR((void *)iface->regs_base)) {
 		dev_err(&pdev->dev, "Cannot map IO\n");
-		rc = -ENXIO;
-		goto out_error_ioremap;
+		return PTR_ERR((void *)iface->regs_base);

Do we need the casts?

drivers/i2c/busses/i2c-bfin-twi.c static int i2c_bfin_twi_remove(struct platform_device *pdev) · line 744

Quoted 6 lines
drivers/i2c/busses/i2c-bfin-twi.c +0 -2
@@ -740,8 +728,6 @@ static int i2c_bfin_twi_remove(struct platform_device *pdev)
 	i2c_del_adapter(&(iface->adap));
 	free_irq(iface->irq, iface);
 	peripheral_free_list(dev_get_platdata(&pdev->dev));
-	iounmap(iface->regs_base);
-	kfree(iface);

You missed to remove the free irq.

Have you actually tried unloading the module?

#4 lore raw

Hi Wolfram,

Quoted 10 lines · Wolfram Sang

drivers/i2c/busses/i2c-bfin-twi.c static int i2c_bfin_twi_probe(struct platform_device *pdev) · line 649

Quoted 8 lines
drivers/i2c/busses/i2c-bfin-twi.c +1 -2
@@ -646,22 +646,19 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
      if (res == NULL) {
              dev_err(&pdev->dev, "Cannot get IORESOURCE_MEM\n");
-             rc = -ENOENT;
-             goto out_error_get_res;
+             return -ENOENT;

You don't need to check the resource. devm_ioremap_resource will do it.

OK

Quoted 11 lines

drivers/i2c/busses/i2c-bfin-twi.c static int i2c_bfin_twi_probe(struct platform_device *pdev) · line 655

Quoted 9 lines
drivers/i2c/busses/i2c-bfin-twi.c +3 -4
-     iface->regs_base = ioremap(res->start, resource_size(res));
-     if (iface->regs_base == NULL) {
+     iface->regs_base = devm_ioremap_resource(&pdev->dev, res);
+     if (IS_ERR((void *)iface->regs_base)) {
              dev_err(&pdev->dev, "Cannot map IO\n");
-             rc = -ENXIO;
-             goto out_error_ioremap;
+             return PTR_ERR((void *)iface->regs_base);

Do we need the casts?

No. I will remove the cast.

Quoted 10 lines

drivers/i2c/busses/i2c-bfin-twi.c static int i2c_bfin_twi_remove(struct platform_device *pdev) · line 744

Quoted 7 lines
drivers/i2c/busses/i2c-bfin-twi.c +0 -2
@@ -740,8 +728,6 @@ static int i2c_bfin_twi_remove(struct platform_device *pdev)
      i2c_del_adapter(&(iface->adap));
      free_irq(iface->irq, iface);
      peripheral_free_list(dev_get_platdata(&pdev->dev));
-     iounmap(iface->regs_base);
-     kfree(iface);

You missed to remove the free irq.

Quoted 2 lines

Have you actually tried unloading the module?

Ok. The free_irq should be removed.

I will send a new patch.

Thank you.

Sonic