All of lore.kernel.org
 help / color / mirror / Atom feed
From: Julia Lawall <julia@diku.dk>
To: ben-linux@fluff.org
Cc: kernel-janitors@vger.kernel.org, linux-i2c@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 1/5] drivers/i2c/busses/i2c-au1550.c: Convert release_resource to release_region/release_mem_region
Date: Sun, 13 Feb 2011 13:12:08 +0100	[thread overview]
Message-ID: <1297599132-7226-2-git-send-email-julia@diku.dk> (raw)
In-Reply-To: <1297599132-7226-1-git-send-email-julia@diku.dk>

Request_region should be used with release_region, not release_resource.

The result of request_mem_region is no longer stored.  Instead the field
ioarea is used to store a pointer to the resource structure that contains
the start address.  This is the information that is needed later in
i2c_au1550_remove to release the region.  The field ioarea is not used for
anything else.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression x,E;
@@
(
*x = request_region(...)
|
*x = request_mem_region(...)
)
... when != release_region(x)
    when != x = E
* release_resource(x);
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>

---
Not compiled due to incompatible architecture.

 drivers/i2c/busses/i2c-au1550.c |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c
index 532828b..2ec78d7 100644
--- a/drivers/i2c/busses/i2c-au1550.c
+++ b/drivers/i2c/busses/i2c-au1550.c
@@ -389,13 +389,12 @@ i2c_au1550_probe(struct platform_device *pdev)
 		goto out;
 	}
 
-	priv->ioarea = request_mem_region(r->start, resource_size(r),
-					  pdev->name);
-	if (!priv->ioarea) {
+	if (!request_mem_region(r->start, resource_size(r), pdev->name)) {
 		ret = -EBUSY;
 		goto out_mem;
 	}
 
+	priv->ioarea = r;
 	priv->psc_base = CKSEG1ADDR(r->start);
 	priv->xfer_timeout = 200;
 	priv->ack_timeout = 200;
@@ -418,8 +417,7 @@ i2c_au1550_probe(struct platform_device *pdev)
 
 	i2c_au1550_disable(priv);
 
-	release_resource(priv->ioarea);
-	kfree(priv->ioarea);
+	release_mem_region(r->start, resource_size(r));
 out_mem:
 	kfree(priv);
 out:
@@ -430,12 +428,12 @@ static int __devexit
 i2c_au1550_remove(struct platform_device *pdev)
 {
 	struct i2c_au1550_data *priv = platform_get_drvdata(pdev);
+	struct resource *r = priv->ioarea;
 
 	platform_set_drvdata(pdev, NULL);
 	i2c_del_adapter(&priv->adap);
 	i2c_au1550_disable(priv);
-	release_resource(priv->ioarea);
-	kfree(priv->ioarea);
+	release_mem_region(r->start, resource_size(r));
 	kfree(priv);
 	return 0;
 }


WARNING: multiple messages have this Message-ID (diff)
From: Julia Lawall <julia@diku.dk>
To: ben-linux@fluff.org
Cc: kernel-janitors@vger.kernel.org, linux-i2c@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 1/5] drivers/i2c/busses/i2c-au1550.c: Convert release_resource to release_region/release_mem_
Date: Sun, 13 Feb 2011 11:50:55 +0000	[thread overview]
Message-ID: <1297599132-7226-2-git-send-email-julia@diku.dk> (raw)
In-Reply-To: <1297599132-7226-1-git-send-email-julia@diku.dk>

Request_region should be used with release_region, not release_resource.

The result of request_mem_region is no longer stored.  Instead the field
ioarea is used to store a pointer to the resource structure that contains
the start address.  This is the information that is needed later in
i2c_au1550_remove to release the region.  The field ioarea is not used for
anything else.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression x,E;
@@
(
*x = request_region(...)
|
*x = request_mem_region(...)
)
... when != release_region(x)
    when != x = E
* release_resource(x);
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>

---
Not compiled due to incompatible architecture.

 drivers/i2c/busses/i2c-au1550.c |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c
index 532828b..2ec78d7 100644
--- a/drivers/i2c/busses/i2c-au1550.c
+++ b/drivers/i2c/busses/i2c-au1550.c
@@ -389,13 +389,12 @@ i2c_au1550_probe(struct platform_device *pdev)
 		goto out;
 	}
 
-	priv->ioarea = request_mem_region(r->start, resource_size(r),
-					  pdev->name);
-	if (!priv->ioarea) {
+	if (!request_mem_region(r->start, resource_size(r), pdev->name)) {
 		ret = -EBUSY;
 		goto out_mem;
 	}
 
+	priv->ioarea = r;
 	priv->psc_base = CKSEG1ADDR(r->start);
 	priv->xfer_timeout = 200;
 	priv->ack_timeout = 200;
@@ -418,8 +417,7 @@ i2c_au1550_probe(struct platform_device *pdev)
 
 	i2c_au1550_disable(priv);
 
-	release_resource(priv->ioarea);
-	kfree(priv->ioarea);
+	release_mem_region(r->start, resource_size(r));
 out_mem:
 	kfree(priv);
 out:
@@ -430,12 +428,12 @@ static int __devexit
 i2c_au1550_remove(struct platform_device *pdev)
 {
 	struct i2c_au1550_data *priv = platform_get_drvdata(pdev);
+	struct resource *r = priv->ioarea;
 
 	platform_set_drvdata(pdev, NULL);
 	i2c_del_adapter(&priv->adap);
 	i2c_au1550_disable(priv);
-	release_resource(priv->ioarea);
-	kfree(priv->ioarea);
+	release_mem_region(r->start, resource_size(r));
 	kfree(priv);
 	return 0;
 }


  reply	other threads:[~2011-02-13 11:50 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-13 11:50 [PATCH 0/5] Convert release_resource to release_region/release_mem_region Julia Lawall
2011-02-13 12:12 ` Julia Lawall
2011-02-13 11:50 ` Julia Lawall [this message]
2011-02-13 12:12   ` [PATCH 1/5] drivers/i2c/busses/i2c-au1550.c: " Julia Lawall
2011-02-13 11:51 ` [PATCH 3/5] drivers/char/pcmcia/ipwireless/main.c: Convert release_resource to release_region/releas Julia Lawall
2011-02-13 12:12   ` [PATCH 3/5] drivers/char/pcmcia/ipwireless/main.c: Convert release_resource to release_region/release_mem_region Julia Lawall
2011-02-16  7:21   ` Dominik Brodowski
2011-02-16  7:21     ` [PATCH 3/5] drivers/char/pcmcia/ipwireless/main.c: Convert Dominik Brodowski
2011-02-16  8:44     ` [PATCH 3/5] drivers/char/pcmcia/ipwireless/main.c: Convert release_resource to release_region/release_mem_region Jiri Kosina
2011-02-16  8:44       ` [PATCH 3/5] drivers/char/pcmcia/ipwireless/main.c: Convert Jiri Kosina
     [not found] ` <1297599132-7226-1-git-send-email-julia-dAYI7NvHqcQ@public.gmane.org>
2011-02-13 11:51   ` [PATCH 5/5] drivers/i2c/busses/i2c-nuc900.c: Convert release_resource to release_region/release_mem_ Julia Lawall
2011-02-13 12:12     ` [PATCH 5/5] drivers/i2c/busses/i2c-nuc900.c: Convert release_resource to release_region/release_mem_region Julia Lawall
2011-02-13 12:12     ` Julia Lawall
2011-02-14 16:56     ` Marek Vasut
2011-02-14 16:56       ` [PATCH 5/5] drivers/i2c/busses/i2c-nuc900.c: Convert release_resource to release_region/release_ Marek Vasut
2011-02-14 16:56       ` [PATCH 5/5] drivers/i2c/busses/i2c-nuc900.c: Convert release_resource to release_region/release_mem_region Marek Vasut
2011-02-14 17:04       ` Julia Lawall
2011-02-14 17:04         ` [PATCH 5/5] drivers/i2c/busses/i2c-nuc900.c: Convert release_resource Julia Lawall
2011-02-14 17:04         ` [PATCH 5/5] drivers/i2c/busses/i2c-nuc900.c: Convert release_resource to release_region/release_mem_region Julia Lawall
2011-02-13 11:51 ` [PATCH 4/5] arch/x86/pci/direct.c: " Julia Lawall
2011-02-13 12:12   ` Julia Lawall
2011-04-08 19:50   ` Jesse Barnes
2011-04-08 19:50     ` [PATCH 4/5] arch/x86/pci/direct.c: Convert release_resource to Jesse Barnes
2011-02-13 11:51 ` [PATCH 2/5] drivers/char/hw_random/omap-rng.c: Convert release_resource to release_region/release_me Julia Lawall
2011-02-13 12:12   ` [PATCH 2/5] drivers/char/hw_random/omap-rng.c: Convert release_resource to release_region/release_mem_region Julia Lawall
2011-02-14 22:42   ` Matt Mackall
2011-02-14 22:42     ` [PATCH 2/5] drivers/char/hw_random/omap-rng.c: Convert Matt Mackall
2011-02-14 22:47     ` [PATCH 2/5] drivers/char/hw_random/omap-rng.c: Convert release_resource to release_region/release_mem_region Herbert Xu
2011-02-14 22:47       ` [PATCH 2/5] drivers/char/hw_random/omap-rng.c: Convert Herbert Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1297599132-7226-2-git-send-email-julia@diku.dk \
    --to=julia@diku.dk \
    --cc=ben-linux@fluff.org \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.