Commit 4a0543ee8d17515420d9133c0e733298d1658523

Authored by Peter Senna Tschudin
Committed by Mauro Carvalho Chehab
1 parent 47aab4ab20

[media] drivers/media/dvb-frontends/s921.c: Removes useless kfree()

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>

Showing 1 changed file with 2 additions and 7 deletions Side-by-side Diff

drivers/media/dvb-frontends/s921.c
... ... @@ -487,9 +487,9 @@
487 487 kzalloc(sizeof(struct s921_state), GFP_KERNEL);
488 488  
489 489 dprintk("\n");
490   - if (state == NULL) {
  490 + if (!state) {
491 491 rc("Unable to kzalloc\n");
492   - goto rcor;
  492 + return NULL;
493 493 }
494 494  
495 495 /* setup the state */
... ... @@ -502,11 +502,6 @@
502 502 state->frontend.demodulator_priv = state;
503 503  
504 504 return &state->frontend;
505   -
506   -rcor:
507   - kfree(state);
508   -
509   - return NULL;
510 505 }
511 506 EXPORT_SYMBOL(s921_attach);
512 507