Am 12.09.2012 17:06, schrieb Peter Senna Tschudin: > From: Peter Senna Tschudin <peter.senna@xxxxxxxxx> > > 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@xxxxxxxxx> > > --- > drivers/staging/gdm72xx/gdm_sdio.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/staging/gdm72xx/gdm_sdio.c b/drivers/staging/gdm72xx/gdm_sdio.c > index f824290..a0621d9 100644 > --- a/drivers/staging/gdm72xx/gdm_sdio.c > +++ b/drivers/staging/gdm72xx/gdm_sdio.c > @@ -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)); This should be r = kzmalloc(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) > > -- > To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
