From patchwork Wed Sep 12 12:56:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Senna Tschudin X-Patchwork-Id: 1443501 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 5D4C9E00C3 for ; Wed, 12 Sep 2012 12:57:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758377Ab2ILM43 (ORCPT ); Wed, 12 Sep 2012 08:56:29 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:38091 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758341Ab2ILM40 (ORCPT ); Wed, 12 Sep 2012 08:56:26 -0400 Received: by mail-wg0-f44.google.com with SMTP id dr13so1485556wgb.1 for ; Wed, 12 Sep 2012 05:56:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=v3H3JuBvmUbrxgfNv98auBF4Jkk3FfSxhCQIE3XkXLQ=; b=ksRwjGzJW3/02SoQzCp2/Ui4tzTsdJz+Vw55EyUhPSyRTDBsU1+6WGpLa135MW+p5m Hk0rVK/0RfV9211mBIhbEGM5FehFw6enbhSA2DwtWUntbJLtxgC9VivPP2PAiEOW1M0e 1xlHFZxBZQuGvEREHgLhzwQQpKU41uPqczaKFGq4tFeT5FmQFOZnIw7f2QabCE+IUDvq 8tACKQCsrxXzZsSUAEDxJ6DbtdocpUhgM6JGBRANz/n0p789yZGOxQ6Yp5BC+NCk09Pg Z8vuQGElZSLgRn5ekwsUxJmMd1D35kZNBe6fw2sP49qqe5v44qxLnxphoC6/U8XivOYv 3cig== Received: by 10.180.104.200 with SMTP id gg8mr32615755wib.14.1347454586015; Wed, 12 Sep 2012 05:56:26 -0700 (PDT) Received: from localhost.localdomain (ppeter.rsr.lip6.fr. [132.227.76.16]) by mx.google.com with ESMTPS id cl8sm7933596wib.10.2012.09.12.05.56.24 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Sep 2012 05:56:25 -0700 (PDT) From: Peter Senna Tschudin To: Mauro Carvalho Chehab Cc: kernel-janitors@vger.kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/8] drivers/media/dvb-frontends/lg2160.c: Removes useless kfree() Date: Wed, 12 Sep 2012 14:56:03 +0200 Message-Id: <1347454564-5178-7-git-send-email-peter.senna@gmail.com> X-Mailer: git-send-email 1.7.11.4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Peter Senna Tschudin 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/) // @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); // Signed-off-by: Peter Senna Tschudin --- drivers/media/dvb-frontends/lg2160.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/dvb-frontends/lg2160.c b/drivers/media/dvb-frontends/lg2160.c index cc11260..5fd14f8 100644 --- a/drivers/media/dvb-frontends/lg2160.c +++ b/drivers/media/dvb-frontends/lg2160.c @@ -1421,8 +1421,8 @@ struct dvb_frontend *lg2160_attach(const struct lg2160_config *config, config ? config->i2c_addr : 0); state = kzalloc(sizeof(struct lg216x_state), GFP_KERNEL); - if (state == NULL) - goto fail; + if (!state) + return NULL; state->cfg = config; state->i2c_adap = i2c_adap; @@ -1449,10 +1449,6 @@ struct dvb_frontend *lg2160_attach(const struct lg2160_config *config, state->frontend.dtv_property_cache.atscmh_parade_id = 1; return &state->frontend; -fail: - lg_warn("unable to detect LG216x hardware\n"); - kfree(state); - return NULL; } EXPORT_SYMBOL(lg2160_attach);