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

index 8352ce1..6ec16a2 100644 (file)
@@ -351,8 +351,8 @@ struct dvb_frontend *s5h1432_attach(const struct s5h1432_config *config,
        printk(KERN_INFO " Enter s5h1432_attach(). attach success!\n");
        /* allocate memory for the internal state */
        state = kmalloc(sizeof(struct s5h1432_state), GFP_KERNEL);
-       if (state == NULL)
-               goto error;
+       if (!state)
+               return NULL;
 
        /* setup the state */
        state->config = config;
@@ -367,10 +367,6 @@ struct dvb_frontend *s5h1432_attach(const struct s5h1432_config *config,
        state->frontend.demodulator_priv = state;
 
        return &state->frontend;
-
-error:
-       kfree(state);
-       return NULL;
 }
 EXPORT_SYMBOL(s5h1432_attach);