From patchwork Thu Jan 3 13:22:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 1927791 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 3B734DF215 for ; Thu, 3 Jan 2013 13:29:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753338Ab3ACN3O (ORCPT ); Thu, 3 Jan 2013 08:29:14 -0500 Received: from mail-pa0-f54.google.com ([209.85.220.54]:52009 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753220Ab3ACN3O (ORCPT ); Thu, 3 Jan 2013 08:29:14 -0500 Received: by mail-pa0-f54.google.com with SMTP id bi5so8704390pad.41 for ; Thu, 03 Jan 2013 05:29:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=S5iOuCOTK60tRYQxcKEYMfOzaoTIyjL0xhiEfZeQ51c=; b=GB+iqGjnq6TNA2A4AnyeFAcJEdJlSe48qXPBDFTXAfkAfXtZp39KogZ+OP0N72wUs/ gHJzGIKre4s6PEL1/MQ9XMUnk93e7GAlYQME5UW+CO9gbuVY+wehFN5kakRJIYqMhklI oHBT6/gX0RP/XRlppwYd+zdwyBIsWxnTC3IDHo2LhTk8BAeGI6n2RxkwVvT7xyXr/zL1 +6q5yBwPDrq8/mBAduQdx7M5m8X7p5YAvsh8qz2PEPvT6C2Wne1ZuWy745JOSlWLUvUS 7ubZ8C7AUmYRame+TYXjy3bDNU50ufg7nJpMhOB9VHERruS0YzIq5cKY2vXo174obVE2 Bjmg== X-Received: by 10.68.130.161 with SMTP id of1mr134294891pbb.32.1357219441913; Thu, 03 Jan 2013 05:24:01 -0800 (PST) Received: from localhost.localdomain ([122.166.13.141]) by mx.google.com with ESMTPS id ix9sm30343226pbc.7.2013.01.03.05.23.58 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 03 Jan 2013 05:24:01 -0800 (PST) From: "Lad, Prabhakar" To: LMML Cc: LKML , Mauro Carvalho Chehab , DLOS , Hans Verkuil , "Lad, Prabhakar" , Manjunath Hadli Subject: [PATCH] tvp7002: use devm_kzalloc() instead of kzalloc() Date: Thu, 3 Jan 2013 18:52:42 +0530 Message-Id: <1357219362-9080-4-git-send-email-prabhakar.lad@ti.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1357219362-9080-1-git-send-email-prabhakar.lad@ti.com> References: <1357219362-9080-1-git-send-email-prabhakar.lad@ti.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org I2C drivers can use devm_kzalloc() too in their .probe() methods. Doing so simplifies their clean up paths. Signed-off-by: Lad, Prabhakar Signed-off-by: Manjunath Hadli --- drivers/media/i2c/tvp7002.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/media/i2c/tvp7002.c b/drivers/media/i2c/tvp7002.c index fb6a5b5..2d4c86e 100644 --- a/drivers/media/i2c/tvp7002.c +++ b/drivers/media/i2c/tvp7002.c @@ -1036,7 +1036,7 @@ static int tvp7002_probe(struct i2c_client *c, const struct i2c_device_id *id) return -ENODEV; } - device = kzalloc(sizeof(struct tvp7002), GFP_KERNEL); + device = devm_kzalloc(&c->dev, sizeof(struct tvp7002), GFP_KERNEL); if (!device) return -ENOMEM; @@ -1088,17 +1088,12 @@ static int tvp7002_probe(struct i2c_client *c, const struct i2c_device_id *id) V4L2_CID_GAIN, 0, 255, 1, 0); sd->ctrl_handler = &device->hdl; if (device->hdl.error) { - int err = device->hdl.error; - v4l2_ctrl_handler_free(&device->hdl); - kfree(device); - return err; + return device->hdl.error; } v4l2_ctrl_handler_setup(&device->hdl); found_error: - if (error < 0) - kfree(device); return error; } @@ -1120,7 +1115,6 @@ static int tvp7002_remove(struct i2c_client *c) v4l2_device_unregister_subdev(sd); v4l2_ctrl_handler_free(&device->hdl); - kfree(device); return 0; }