From patchwork Fri Jan 4 05:11:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 1930901 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 B3FC0DFABD for ; Fri, 4 Jan 2013 05:11:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750847Ab3ADFLf (ORCPT ); Fri, 4 Jan 2013 00:11:35 -0500 Received: from mail-pb0-f43.google.com ([209.85.160.43]:44684 "EHLO mail-pb0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750711Ab3ADFLf (ORCPT ); Fri, 4 Jan 2013 00:11:35 -0500 Received: by mail-pb0-f43.google.com with SMTP id um15so8962820pbc.16 for ; Thu, 03 Jan 2013 21:11:34 -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; bh=4uhdNtG8H2ey4eQx+b5VjIcxodpW+c8vgZml2xTIOYg=; b=Eop4pPNiUZtPaEIbCr74ArOShq/Wz8DWR2fypOsr4lAk2UXoiy64fLX0zLtebPikoK NQ1btkZsdmibM6uWpDC7EYxhZbZq7qDMOvMJXCjjXmZl8sM47DnWlbKA1QZiyWm+foLW Vi5NbxraPDeJnR/c9LQ5GrKtxB/eEc2i1/eQjersEmQIncnz/amay6gFS/KUlN7bDIH3 o68M5fIKj96YCNMbvcVGUfPTsEtARW7WpeDmvx+VJz7U0kBQips/FtEVqNvodYj98cGz USOPAWym6hBP0Blph78KRmQI0860ohpw/+DBJ1C5SXrQAHtudBoRaAKbJuWD20HJinJF Cblw== X-Received: by 10.66.83.6 with SMTP id m6mr151405708pay.52.1357276293976; Thu, 03 Jan 2013 21:11:33 -0800 (PST) Received: from localhost.localdomain ([122.166.13.141]) by mx.google.com with ESMTPS id w5sm32501182pax.28.2013.01.03.21.11.28 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 03 Jan 2013 21:11:32 -0800 (PST) From: "Lad, Prabhakar" To: LMML Cc: LKML , Mauro Carvalho Chehab , Laurent Pinchart , Hans Verkuil , "Lad, Prabhakar" , Manjunath Hadli Subject: [PATCH v2] adv7343: use devm_kzalloc() instead of kzalloc() Date: Fri, 4 Jan 2013 10:41:15 +0530 Message-Id: <1357276277-21812-1-git-send-email-prabhakar.lad@ti.com> X-Mailer: git-send-email 1.7.4.1 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 Acked-by: Laurent Pinchart --- Changes for v2: 1: Fixed comments pointed out by Laurent. drivers/media/i2c/adv7343.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/media/i2c/adv7343.c b/drivers/media/i2c/adv7343.c index 2b5aa67..432eb5f 100644 --- a/drivers/media/i2c/adv7343.c +++ b/drivers/media/i2c/adv7343.c @@ -397,7 +397,8 @@ static int adv7343_probe(struct i2c_client *client, v4l_info(client, "chip found @ 0x%x (%s)\n", client->addr << 1, client->adapter->name); - state = kzalloc(sizeof(struct adv7343_state), GFP_KERNEL); + state = devm_kzalloc(&client->dev, sizeof(struct adv7343_state), + GFP_KERNEL); if (state == NULL) return -ENOMEM; @@ -431,16 +432,13 @@ static int adv7343_probe(struct i2c_client *client, int err = state->hdl.error; v4l2_ctrl_handler_free(&state->hdl); - kfree(state); return err; } v4l2_ctrl_handler_setup(&state->hdl); err = adv7343_initialize(&state->sd); - if (err) { + if (err) v4l2_ctrl_handler_free(&state->hdl); - kfree(state); - } return err; } @@ -451,7 +449,6 @@ static int adv7343_remove(struct i2c_client *client) v4l2_device_unregister_subdev(sd); v4l2_ctrl_handler_free(&state->hdl); - kfree(state); return 0; }