From patchwork Fri Apr 25 01:40:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 4057311 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 00D8EBFF02 for ; Fri, 25 Apr 2014 01:40:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1EA1920381 for ; Fri, 25 Apr 2014 01:40:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CD86C20145 for ; Fri, 25 Apr 2014 01:40:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751465AbaDYBk3 (ORCPT ); Thu, 24 Apr 2014 21:40:29 -0400 Received: from mail-yk0-f173.google.com ([209.85.160.173]:53606 "EHLO mail-yk0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751350AbaDYBkZ (ORCPT ); Thu, 24 Apr 2014 21:40:25 -0400 Received: by mail-yk0-f173.google.com with SMTP id 10so2800683ykt.32 for ; Thu, 24 Apr 2014 18:40:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=HNNwpxGjN4l1ijy1V35406ifGWA60XA2nUR5sc03OkQ=; b=UIqTcjTbYhkCdzifE1O69l8mkzP1k42RjkHRRRzQShwt6dYbtRDTrAsn+FBTay0K0r FslAxASiWj3lOYaH3QKD4y677IF/ufTqeyrwmPEs8vSBFvRg0rXuusOrbmFfpekDwMtL 8bTtlSWJQ0Pzwj5Iy5LhSu5qtEBT2dNYQiEPmXWYy4lkEreSEeun7sGYUUXSHd8fET2Z a4elLR57vcBosgla6lAp0+Y8HUiVWfiqLRpIeAA4gHI8f08dIoCnf/I5zr1zVjBjCg3v 6uI2xD3YLOQKJ34MRS/ejrSutNHgDUnTAhlAARfV9xeIzOCsPcjn4oOz1zrEb5HFTJRM N7YA== X-Received: by 10.236.42.43 with SMTP id i31mr7587786yhb.31.1398390024851; Thu, 24 Apr 2014 18:40:24 -0700 (PDT) Received: from localhost.localdomain ([177.194.43.224]) by mx.google.com with ESMTPSA id z4sm10878899yhc.11.2014.04.24.18.40.23 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 24 Apr 2014 18:40:24 -0700 (PDT) From: Fabio Estevam To: dmitry.torokhov@gmail.com Cc: peter.ujfalusi@ti.com, linux-input@vger.kernel.org, Fabio Estevam Subject: [PATCH] Input: twl6040-vibra - use devm_regulator_bulk_get() Date: Thu, 24 Apr 2014 22:40:04 -0300 Message-Id: <1398390004-20535-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.8.3.2 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Fabio Estevam Using devm_regulator_bulk_get() can make the code cleaner and smaller as we do not need to call regulator_bulk_free() in the error and remove paths. Signed-off-by: Fabio Estevam --- drivers/input/misc/twl6040-vibra.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c index 77dc23b..bf0cb2d 100644 --- a/drivers/input/misc/twl6040-vibra.c +++ b/drivers/input/misc/twl6040-vibra.c @@ -323,8 +323,9 @@ static int twl6040_vibra_probe(struct platform_device *pdev) * When booted with Device tree the regulators are attached to the * parent device (twl6040 MFD core) */ - ret = regulator_bulk_get(twl6040_core_dev, ARRAY_SIZE(info->supplies), - info->supplies); + ret = devm_regulator_bulk_get(twl6040_core_dev, + ARRAY_SIZE(info->supplies), + info->supplies); if (ret) { dev_err(info->dev, "couldn't get regulators %d\n", ret); return ret; @@ -336,7 +337,7 @@ static int twl6040_vibra_probe(struct platform_device *pdev) if (ret) { dev_err(info->dev, "failed to set VDDVIBL volt %d\n", ret); - goto err_regulator; + return ret; } } @@ -346,7 +347,7 @@ static int twl6040_vibra_probe(struct platform_device *pdev) if (ret) { dev_err(info->dev, "failed to set VDDVIBR volt %d\n", ret); - goto err_regulator; + return ret; } } @@ -355,8 +356,7 @@ static int twl6040_vibra_probe(struct platform_device *pdev) info->input_dev = input_allocate_device(); if (info->input_dev == NULL) { dev_err(info->dev, "couldn't allocate input device\n"); - ret = -ENOMEM; - goto err_regulator; + return -ENOMEM; } input_set_drvdata(info->input_dev, info); @@ -387,8 +387,6 @@ err_iff: input_ff_destroy(info->input_dev); err_ialloc: input_free_device(info->input_dev); -err_regulator: - regulator_bulk_free(ARRAY_SIZE(info->supplies), info->supplies); return ret; } @@ -397,7 +395,6 @@ static int twl6040_vibra_remove(struct platform_device *pdev) struct vibra_info *info = platform_get_drvdata(pdev); input_unregister_device(info->input_dev); - regulator_bulk_free(ARRAY_SIZE(info->supplies), info->supplies); return 0; }