* [PATCH v2 5/9] drivers/staging/gdm72xx/gdm_sdio.c: Remove useless kfree
@ 2012-09-14 8:15 Peter Senna Tschudin
2012-09-14 14:44 ` walter harms
2012-09-17 12:18 ` Greg Kroah-Hartman
0 siblings, 2 replies; 6+ messages in thread
From: Peter Senna Tschudin @ 2012-09-14 8:15 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: gregkh, wharms, kernel-janitors, devel, linux-kernel
From: Peter Senna Tschudin <peter.senna@gmail.com>
Remove useless kfree() and clean up code related to the removal.
The semantic patch that finds this problem is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@r exists@
position p1,p2;
expression x;
@@
if (x@p1 == NULL) { ... kfree@p2(x); ... return ...; }
@unchanged exists@
position r.p1,r.p2;
expression e <= r.x,x,e1;
iterator I;
statement S;
@@
if (x@p1 == NULL) { ... when != I(x,...) S
when != e = e1
when != e += e1
when != e -= e1
when != ++e
when != --e
when != e++
when != e--
when != &e
kfree@p2(x); ... return ...; }
@ok depends on unchanged exists@
position any r.p1;
position r.p2;
expression x;
@@
... when != true x@p1 == NULL
kfree@p2(x);
@depends on !ok && unchanged@
position r.p2;
expression x;
@@
*kfree@p2(x);
// </smpl>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
drivers/staging/gdm72xx/gdm_sdio.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/gdm72xx/gdm_sdio.c b/drivers/staging/gdm72xx/gdm_sdio.c
index f824290..f13dcbf 100644
--- a/drivers/staging/gdm72xx/gdm_sdio.c
+++ b/drivers/staging/gdm72xx/gdm_sdio.c
@@ -93,18 +93,13 @@ static struct sdio_rx *alloc_rx_struct(struct rx_cxt *rx)
{
struct sdio_rx *r = NULL;
- r = kmalloc(sizeof(*r), GFP_ATOMIC);
- if (r == NULL)
- goto out;
-
- memset(r, 0, sizeof(*r));
+ r = kzalloc(sizeof(*r), GFP_ATOMIC);
+ if (!r)
+ return NULL;
r->rx_cxt = rx;
return r;
-out:
- kfree(r);
- return NULL;
}
static void free_rx_struct(struct sdio_rx *r)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 5/9] drivers/staging/gdm72xx/gdm_sdio.c: Remove useless kfree
2012-09-14 8:15 [PATCH v2 5/9] drivers/staging/gdm72xx/gdm_sdio.c: Remove useless kfree Peter Senna Tschudin
@ 2012-09-14 14:44 ` walter harms
2012-09-17 12:18 ` Greg Kroah-Hartman
1 sibling, 0 replies; 6+ messages in thread
From: walter harms @ 2012-09-14 14:44 UTC (permalink / raw)
To: Peter Senna Tschudin
Cc: Greg Kroah-Hartman, kernel-janitors, devel, linux-kernel
Am 14.09.2012 10:15, schrieb Peter Senna Tschudin:
> From: Peter Senna Tschudin <peter.senna@gmail.com>
>
> Remove useless kfree() and clean up code related to the removal.
>
> The semantic patch that finds this problem is as follows:
> (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @r exists@
> position p1,p2;
> expression x;
> @@
>
> if (x@p1 == NULL) { ... kfree@p2(x); ... return ...; }
>
> @unchanged exists@
> position r.p1,r.p2;
> expression e <= r.x,x,e1;
> iterator I;
> statement S;
> @@
>
> if (x@p1 == NULL) { ... when != I(x,...) S
> when != e = e1
> when != e += e1
> when != e -= e1
> when != ++e
> when != --e
> when != e++
> when != e--
> when != &e
> kfree@p2(x); ... return ...; }
>
> @ok depends on unchanged exists@
> position any r.p1;
> position r.p2;
> expression x;
> @@
>
> ... when != true x@p1 == NULL
> kfree@p2(x);
>
> @depends on !ok && unchanged@
> position r.p2;
> expression x;
> @@
>
> *kfree@p2(x);
> // </smpl>
>
> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
>
> ---
> drivers/staging/gdm72xx/gdm_sdio.c | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/staging/gdm72xx/gdm_sdio.c b/drivers/staging/gdm72xx/gdm_sdio.c
> index f824290..f13dcbf 100644
> --- a/drivers/staging/gdm72xx/gdm_sdio.c
> +++ b/drivers/staging/gdm72xx/gdm_sdio.c
> @@ -93,18 +93,13 @@ static struct sdio_rx *alloc_rx_struct(struct rx_cxt *rx)
> {
> struct sdio_rx *r = NULL;
>
This is nice but just one thing:
you can also remove this = NULL here.
re,
wh
> - r = kmalloc(sizeof(*r), GFP_ATOMIC);
> - if (r == NULL)
> - goto out;
> -
> - memset(r, 0, sizeof(*r));
> + r = kzalloc(sizeof(*r), GFP_ATOMIC);
> + if (!r)
> + return NULL;
>
> r->rx_cxt = rx;
>
> return r;
> -out:
> - kfree(r);
> - return NULL;
> }
>
> static void free_rx_struct(struct sdio_rx *r)
>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 5/9] drivers/staging/gdm72xx/gdm_sdio.c: Remove useless kfree
2012-09-14 8:15 [PATCH v2 5/9] drivers/staging/gdm72xx/gdm_sdio.c: Remove useless kfree Peter Senna Tschudin
2012-09-14 14:44 ` walter harms
@ 2012-09-17 12:18 ` Greg Kroah-Hartman
2012-09-17 13:45 ` [PATCH] drivers/staging/gdm72xx/gdm_sdio.c: Replace kmalloc+memset for kzalloc Peter Senna Tschudin
2012-09-17 13:49 ` [PATCH v2 5/9] drivers/staging/gdm72xx/gdm_sdio.c: Remove useless kfree Peter Senna Tschudin
1 sibling, 2 replies; 6+ messages in thread
From: Greg Kroah-Hartman @ 2012-09-17 12:18 UTC (permalink / raw)
To: Peter Senna Tschudin; +Cc: wharms, kernel-janitors, devel, linux-kernel
On Fri, Sep 14, 2012 at 10:15:18AM +0200, Peter Senna Tschudin wrote:
> From: Peter Senna Tschudin <peter.senna@gmail.com>
>
> Remove useless kfree() and clean up code related to the removal.
As I already applid your first patch, care to just send an incremental
patch that makes the change you did here?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] drivers/staging/gdm72xx/gdm_sdio.c: Replace kmalloc+memset for kzalloc
2012-09-17 12:18 ` Greg Kroah-Hartman
@ 2012-09-17 13:45 ` Peter Senna Tschudin
2012-09-17 13:54 ` Ben Chan
2012-09-17 13:49 ` [PATCH v2 5/9] drivers/staging/gdm72xx/gdm_sdio.c: Remove useless kfree Peter Senna Tschudin
1 sibling, 1 reply; 6+ messages in thread
From: Peter Senna Tschudin @ 2012-09-17 13:45 UTC (permalink / raw)
To: gregkh
Cc: devendra.aaru, peter.senna, benchan, syahn, devel, linux-kernel,
kernel-janitors
Replace kmalloc+memset for kzalloc and cleanup related code.
To be applied after 47ad3428a1086af425447f763705e06b16ae905d:
[PATCH 5/9] drivers/staging/gdm72xx/gdm_sdio.c: Remove useless kfree
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
drivers/staging/gdm72xx/gdm_sdio.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/gdm72xx/gdm_sdio.c b/drivers/staging/gdm72xx/gdm_sdio.c
index a0621d9..2e1a964 100644
--- a/drivers/staging/gdm72xx/gdm_sdio.c
+++ b/drivers/staging/gdm72xx/gdm_sdio.c
@@ -91,14 +91,12 @@ static void free_tx_struct(struct sdio_tx *t)
static struct sdio_rx *alloc_rx_struct(struct rx_cxt *rx)
{
- struct sdio_rx *r = NULL;
+ struct sdio_rx *r;
- r = kmalloc(sizeof(*r), GFP_ATOMIC);
+ r = kzalloc(sizeof(*r), GFP_ATOMIC);
if (!r)
return NULL;
- memset(r, 0, sizeof(*r));
-
r->rx_cxt = rx;
return r;
--
1.7.11.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 5/9] drivers/staging/gdm72xx/gdm_sdio.c: Remove useless kfree
2012-09-17 12:18 ` Greg Kroah-Hartman
2012-09-17 13:45 ` [PATCH] drivers/staging/gdm72xx/gdm_sdio.c: Replace kmalloc+memset for kzalloc Peter Senna Tschudin
@ 2012-09-17 13:49 ` Peter Senna Tschudin
1 sibling, 0 replies; 6+ messages in thread
From: Peter Senna Tschudin @ 2012-09-17 13:49 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: wharms, kernel-janitors, devel, linux-kernel
> As I already applid your first patch, care to just send an incremental
> patch that makes the change you did here?
I've just sent a patch for that:
[PATCH] drivers/staging/gdm72xx/gdm_sdio.c: Replace kmalloc+memset for kzalloc
--
Peter
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drivers/staging/gdm72xx/gdm_sdio.c: Replace kmalloc+memset for kzalloc
2012-09-17 13:45 ` [PATCH] drivers/staging/gdm72xx/gdm_sdio.c: Replace kmalloc+memset for kzalloc Peter Senna Tschudin
@ 2012-09-17 13:54 ` Ben Chan
0 siblings, 0 replies; 6+ messages in thread
From: Ben Chan @ 2012-09-17 13:54 UTC (permalink / raw)
To: Peter Senna Tschudin
Cc: gregkh, devendra.aaru, syahn, devel, linux-kernel,
kernel-janitors
FYI, a similar patch has already been applied: "staging: gdm72xx:
simplify alloc_tx_struct and alloc_rx_struct (commit
129575f2a8958a1e90780b0d5b80702bb45b5aac)"
Thanks,
Ben
On Mon, Sep 17, 2012 at 6:45 AM, Peter Senna Tschudin
<peter.senna@gmail.com> wrote:
> Replace kmalloc+memset for kzalloc and cleanup related code.
>
> To be applied after 47ad3428a1086af425447f763705e06b16ae905d:
> [PATCH 5/9] drivers/staging/gdm72xx/gdm_sdio.c: Remove useless kfree
>
> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
> ---
> drivers/staging/gdm72xx/gdm_sdio.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/gdm72xx/gdm_sdio.c b/drivers/staging/gdm72xx/gdm_sdio.c
> index a0621d9..2e1a964 100644
> --- a/drivers/staging/gdm72xx/gdm_sdio.c
> +++ b/drivers/staging/gdm72xx/gdm_sdio.c
> @@ -91,14 +91,12 @@ static void free_tx_struct(struct sdio_tx *t)
>
> static struct sdio_rx *alloc_rx_struct(struct rx_cxt *rx)
> {
> - struct sdio_rx *r = NULL;
> + struct sdio_rx *r;
>
> - r = kmalloc(sizeof(*r), GFP_ATOMIC);
> + r = kzalloc(sizeof(*r), GFP_ATOMIC);
> if (!r)
> return NULL;
>
> - memset(r, 0, sizeof(*r));
> -
> r->rx_cxt = rx;
>
> return r;
> --
> 1.7.11.4
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-09-17 13:55 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-14 8:15 [PATCH v2 5/9] drivers/staging/gdm72xx/gdm_sdio.c: Remove useless kfree Peter Senna Tschudin
2012-09-14 14:44 ` walter harms
2012-09-17 12:18 ` Greg Kroah-Hartman
2012-09-17 13:45 ` [PATCH] drivers/staging/gdm72xx/gdm_sdio.c: Replace kmalloc+memset for kzalloc Peter Senna Tschudin
2012-09-17 13:54 ` Ben Chan
2012-09-17 13:49 ` [PATCH v2 5/9] drivers/staging/gdm72xx/gdm_sdio.c: Remove useless kfree Peter Senna Tschudin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox