From patchwork Thu Jan 3 13:22:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 1927711 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id F34643FDDA for ; Thu, 3 Jan 2013 13:24:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753415Ab3ACNYB (ORCPT ); Thu, 3 Jan 2013 08:24:01 -0500 Received: from mail-da0-f54.google.com ([209.85.210.54]:48990 "EHLO mail-da0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753408Ab3ACNX6 (ORCPT ); Thu, 3 Jan 2013 08:23:58 -0500 Received: by mail-da0-f54.google.com with SMTP id n2so7032010dad.41 for ; Thu, 03 Jan 2013 05:23:57 -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=PFKxzSpazlcbYtd5tzM2qVvLUDN/PzM7beELe5IVL3Y=; b=alRE8Ve7PUHfkulp9Tn18RPC0dVW+aILud0l2X7sRCvLoTGitMn4yP+9dB/PLohZuV H3nnpU2KlTQ2aQmNdHCeRdBrehkV9bvWnsT4JSApoLU7khOyAmdeHruACnAqywciflQl BuEqMzx4Q3jYIVG8Xmvh68rHgKZMp4zismfltJP/puKCXDWaARy/8bF3PrGxvGvOYvfV ZDOEw6GF4MwAcUx4c8Ge1ojdazyAaVdhOMJOFbh84UI7EdpvTQu9VQrapryW7ss2bmPI JVgUrHvgzkb5TZ4uV+W9lzBlculoGC5MyiV0u21JY9Twof9crVJky4D06FZjY98dTQeH +rcw== X-Received: by 10.66.76.198 with SMTP id m6mr145561901paw.32.1357219437809; Thu, 03 Jan 2013 05:23:57 -0800 (PST) Received: from localhost.localdomain ([122.166.13.141]) by mx.google.com with ESMTPS id ix9sm30343226pbc.7.2013.01.03.05.23.53 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 03 Jan 2013 05:23:56 -0800 (PST) From: "Lad, Prabhakar" To: LMML Cc: LKML , Mauro Carvalho Chehab , DLOS , Hans Verkuil , "Lad, Prabhakar" , Manjunath Hadli Subject: [PATCH] tvp514x: use devm_kzalloc() instead of kzalloc() Date: Thu, 3 Jan 2013 18:52:41 +0530 Message-Id: <1357219362-9080-3-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/tvp514x.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/media/i2c/tvp514x.c b/drivers/media/i2c/tvp514x.c index d5e1021..53608ee 100644 --- a/drivers/media/i2c/tvp514x.c +++ b/drivers/media/i2c/tvp514x.c @@ -951,7 +951,7 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id) return -ENODEV; } - decoder = kzalloc(sizeof(*decoder), GFP_KERNEL); + decoder = devm_kzalloc(&client->dev, sizeof(*decoder), GFP_KERNEL); if (!decoder) return -ENOMEM; @@ -995,11 +995,8 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id) V4L2_CID_AUTOGAIN, 0, 1, 1, 1); sd->ctrl_handler = &decoder->hdl; if (decoder->hdl.error) { - int err = decoder->hdl.error; - v4l2_ctrl_handler_free(&decoder->hdl); - kfree(decoder); - return err; + return decoder->hdl.error; } v4l2_ctrl_handler_setup(&decoder->hdl); @@ -1023,7 +1020,6 @@ static int tvp514x_remove(struct i2c_client *client) v4l2_device_unregister_subdev(sd); v4l2_ctrl_handler_free(&decoder->hdl); - kfree(decoder); return 0; } /* TVP5146 Init/Power on Sequence */