[media] drivers/media/dvb-frontends/stb6100.c: Removes useless kfree()
authorPeter Senna Tschudin <peter.senna@gmail.com>
Wed, 12 Sep 2012 11:56:00 +0000 (08:56 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 6 Oct 2012 14:13:49 +0000 (11:13 -0300)
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: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb-frontends/stb6100.c

index 2e93e65d2cdb0e336f881d8b0b5efbd50fd1bbce..45f9523f968f903d463d56f5baf927662b7ffbc0 100644 (file)
@@ -575,8 +575,8 @@ struct dvb_frontend *stb6100_attach(struct dvb_frontend *fe,
        struct stb6100_state *state = NULL;
 
        state = kzalloc(sizeof (struct stb6100_state), GFP_KERNEL);
-       if (state == NULL)
-               goto error;
+       if (!state)
+               return NULL;
 
        state->config           = config;
        state->i2c              = i2c;
@@ -587,10 +587,6 @@ struct dvb_frontend *stb6100_attach(struct dvb_frontend *fe,
 
        printk("%s: Attaching STB6100 \n", __func__);
        return fe;
-
-error:
-       kfree(state);
-       return NULL;
 }
 
 static int stb6100_release(struct dvb_frontend *fe)