From patchwork Wed Oct 10 13:20:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 1581231 Return-Path: X-Original-To: patchwork-linux-input@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 D36BF40D54 for ; Thu, 11 Oct 2012 07:12:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932450Ab2JKHMP (ORCPT ); Thu, 11 Oct 2012 03:12:15 -0400 Received: from opensource.wolfsonmicro.com ([80.75.67.52]:56196 "EHLO opensource.wolfsonmicro.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932449Ab2JKHMM (ORCPT ); Thu, 11 Oct 2012 03:12:12 -0400 Received: from finisterre.wolfsonmicro.main (unknown [203.226.202.110]) by opensource.wolfsonmicro.com (Postfix) with ESMTPSA id A4DE5110A97; Thu, 11 Oct 2012 08:12:10 +0100 (BST) Received: from broonie by finisterre.wolfsonmicro.main with local (Exim 4.80) (envelope-from ) id 1TLwDF-0001Uh-1c; Wed, 10 Oct 2012 22:20:37 +0900 From: Mark Brown To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, Mark Brown Subject: [PATCH 2/3] Input: wm831x-ts - Convert to devm_kzalloc() Date: Wed, 10 Oct 2012 22:20:35 +0900 Message-Id: <1349875236-5707-2-git-send-email-broonie@opensource.wolfsonmicro.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1349875236-5707-1-git-send-email-broonie@opensource.wolfsonmicro.com> References: <1349875236-5707-1-git-send-email-broonie@opensource.wolfsonmicro.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Saves a little code and eliminates the possibility of introducing some leaks. Signed-off-by: Mark Brown --- drivers/input/touchscreen/wm831x-ts.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/input/touchscreen/wm831x-ts.c b/drivers/input/touchscreen/wm831x-ts.c index bf0a4a6..c7eee56 100644 --- a/drivers/input/touchscreen/wm831x-ts.c +++ b/drivers/input/touchscreen/wm831x-ts.c @@ -245,7 +245,8 @@ static __devinit int wm831x_ts_probe(struct platform_device *pdev) if (core_pdata) pdata = core_pdata->touch; - wm831x_ts = kzalloc(sizeof(struct wm831x_ts), GFP_KERNEL); + wm831x_ts = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_ts), + GFP_KERNEL); input_dev = input_allocate_device(); if (!wm831x_ts || !input_dev) { error = -ENOMEM; @@ -376,7 +377,6 @@ err_data_irq: free_irq(wm831x_ts->data_irq, wm831x_ts); err_alloc: input_free_device(input_dev); - kfree(wm831x_ts); return error; } @@ -388,7 +388,6 @@ static __devexit int wm831x_ts_remove(struct platform_device *pdev) free_irq(wm831x_ts->pd_irq, wm831x_ts); free_irq(wm831x_ts->data_irq, wm831x_ts); input_unregister_device(wm831x_ts->input_dev); - kfree(wm831x_ts); return 0; }