drivers/staging/gdm72xx/gdm_sdio.c: Remove useless kfree
authorPeter Senna Tschudin <peter.senna@gmail.com>
Wed, 12 Sep 2012 15:06:44 +0000 (17:06 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 12 Sep 2012 16:43:45 +0000 (09:43 -0700)
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/gdm72xx/gdm_sdio.c

index f8242902ada6c7f6a9d08461e33ed37a8477f0bd..a0621d9c21987611be60085d9da722d6ba269434 100644 (file)
@@ -94,17 +94,14 @@ 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;
+       if (!r)
+               return NULL;
 
        memset(r, 0, sizeof(*r));
 
        r->rx_cxt = rx;
 
        return r;
-out:
-       kfree(r);
-       return NULL;
 }
 
 static void free_rx_struct(struct sdio_rx *r)