From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966652AbcA1UDN (ORCPT ); Thu, 28 Jan 2016 15:03:13 -0500 Received: from h1.radempa.de ([176.9.142.194]:46198 "EHLO mail.cosmopool.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966034AbcA1UCj (ORCPT ); Thu, 28 Jan 2016 15:02:39 -0500 X-Greylist: delayed 412 seconds by postgrey-1.27 at vger.kernel.org; Thu, 28 Jan 2016 15:02:38 EST From: Harald Geyer To: Liam Girdwood , Mark Brown , Heiko Stuebner Cc: linux-kernel@vger.kernel.org, Harald Geyer Subject: [PATCH 2/2] regulator: gpio: Move last remaining memory allocation to devres Date: Thu, 28 Jan 2016 19:55:18 +0000 Message-Id: <1454010918-29369-3-git-send-email-harald@ccbib.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1454010918-29369-1-git-send-email-harald@ccbib.org> References: <1454010918-29369-1-git-send-email-harald@ccbib.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Simple cleanup without functional changes. Signed-off-by: Harald Geyer --- drivers/regulator/gpio-regulator.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c index 5e2e14d..5fe4921 100644 --- a/drivers/regulator/gpio-regulator.c +++ b/drivers/regulator/gpio-regulator.c @@ -263,11 +263,11 @@ static int gpio_regulator_probe(struct platform_device *pdev) return PTR_ERR(config); } - drvdata->desc.name = kstrdup(config->supply_name, GFP_KERNEL); + drvdata->desc.name = devm_kstrdup(&pdev->dev, config->supply_name, + GFP_KERNEL); if (drvdata->desc.name == NULL) { dev_err(&pdev->dev, "Failed to allocate supply name\n"); - ret = -ENOMEM; - goto err; + return -ENOMEM; } if (config->nr_gpios != 0) { @@ -278,7 +278,7 @@ static int gpio_regulator_probe(struct platform_device *pdev) if (ret) { dev_err(&pdev->dev, "Could not obtain regulator setting GPIOs: %d\n", ret); - goto err_name; + return ret; } } @@ -348,9 +348,7 @@ static int gpio_regulator_probe(struct platform_device *pdev) err_gpio: gpio_free_array(drvdata->gpios, drvdata->nr_gpios); -err_name: - kfree(drvdata->desc.name); -err: + return ret; } @@ -362,8 +360,6 @@ static int gpio_regulator_remove(struct platform_device *pdev) gpio_free_array(drvdata->gpios, drvdata->nr_gpios); - kfree(drvdata->desc.name); - return 0; } -- 2.1.4