From patchwork Thu Jan 10 13:36:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1960291 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 A741A3FC85 for ; Thu, 10 Jan 2013 13:36:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752417Ab3AJNgQ (ORCPT ); Thu, 10 Jan 2013 08:36:16 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:41973 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751728Ab3AJNgP (ORCPT ); Thu, 10 Jan 2013 08:36:15 -0500 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id r0ADa8uc004942; Thu, 10 Jan 2013 07:36:09 -0600 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0ADa8KB007071; Thu, 10 Jan 2013 07:36:08 -0600 Received: from dlelxv22.itg.ti.com (172.17.1.197) by dfle73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.1.323.3; Thu, 10 Jan 2013 07:36:08 -0600 Received: from barack.emea.dhcp.ti.com (barack.emea.dhcp.ti.com [137.167.125.64]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0ADa6cV026080; Thu, 10 Jan 2013 07:36:08 -0600 From: Peter Ujfalusi To: Dmitry Torokhov CC: , Subject: [PATCH resend 1/2] Input: twl4030-vibra: Convert to use devm_* in probe Date: Thu, 10 Jan 2013 14:36:04 +0100 Message-ID: <1357824965-30614-2-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1357824965-30614-1-git-send-email-peter.ujfalusi@ti.com> References: <1357824965-30614-1-git-send-email-peter.ujfalusi@ti.com> MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Cleanup to use devm_* when it is possible at probe time. Signed-off-by: Peter Ujfalusi --- drivers/input/misc/twl4030-vibra.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c index 78eb6b3..1fe7644 100644 --- a/drivers/input/misc/twl4030-vibra.c +++ b/drivers/input/misc/twl4030-vibra.c @@ -219,7 +219,7 @@ static int twl4030_vibra_probe(struct platform_device *pdev) return -EINVAL; } - info = kzalloc(sizeof(*info), GFP_KERNEL); + info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL); if (!info) return -ENOMEM; @@ -230,8 +230,7 @@ static int twl4030_vibra_probe(struct platform_device *pdev) info->input_dev = input_allocate_device(); if (info->input_dev == NULL) { dev_err(&pdev->dev, "couldn't allocate input device\n"); - ret = -ENOMEM; - goto err_kzalloc; + return -ENOMEM; } input_set_drvdata(info->input_dev, info); @@ -264,8 +263,6 @@ err_iff: input_ff_destroy(info->input_dev); err_ialloc: input_free_device(info->input_dev); -err_kzalloc: - kfree(info); return ret; } @@ -275,7 +272,6 @@ static int twl4030_vibra_remove(struct platform_device *pdev) /* this also free ff-memless and calls close if needed */ input_unregister_device(info->input_dev); - kfree(info); platform_set_drvdata(pdev, NULL); return 0;