From patchwork Mon Jan 21 09:12:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 156175 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp6153630jaa; Mon, 21 Jan 2019 01:12:24 -0800 (PST) X-Google-Smtp-Source: ALg8bN6wt0l+PFxD6dPhHW/t7zSnAkNAQTE4Ix+c9AwpSy/LRsf6lFsozzOGySp/m/C4+oSYzgNb X-Received: by 2002:a62:36c1:: with SMTP id d184mr29239639pfa.242.1548061944700; Mon, 21 Jan 2019 01:12:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548061944; cv=none; d=google.com; s=arc-20160816; b=jXj2FskOGGnUaArrB+TzKqBX7hgESoFLbzsPhn5sANVypLgKWQOwCeLm3DGy+SvQGP c26+5PI9dFtj2vzQBiYujHPvStaGIMNek6dYLRDE+yYNgzMmQrDeRAT2errv70OwWYOW 0635NPhJJLYEe/Wxt19yeWmU+GHTCxZxusdBrr8uugDLQ2rj24zmqoMyoEdKodueXpsW e5sGGiOT5iZd62CFpgGTNixJwWAilVa3eZ9dfrNKV6OOlU2WsVDn/4+4WQCIGaoJKICt wduQexD9sYq5gWgkXYl9eJPVeYWvPLM5Mf5qc1h46GC9C6WzGQAbwDwzYnhMTZRTdYx6 6ezA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tj5Zx2n3TTtSndEoPHrOd/3BWc5mj7qVROmZh++CMwo=; b=oxuoImxpD5FX/2XnXidENn01N2TsqmvitQ4OG/O+SOLsDGbef0iTn0rl0lz/reqMRD old+/d9IyxgQqoKhZ4QO2ivrMbTljKJV8y2eC5kA58FeYvebSbh7cs2uQy7PiKFWjTkF DkjM2Jo/UzG6H2CbU01X888mWr599ExN4XizgmMZyRb9EiuKuIJW6691bljjpbzV+LiT 1cc8DuCB2BxF+VUGADBWb+p3hblIcdv7HEW8JwyLiMeJjYaUrNOar7crvZhvJxOLqdll pg0y4Lhu1eJ0irKuqumqGdB4SO7uS/jcGyCqovS3t5e4jcGDUUBIS5WbVQFn1cpFtn8Y n3Fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="ML0xuO/8"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c10si12050328pll.271.2019.01.21.01.12.24; Mon, 21 Jan 2019 01:12:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="ML0xuO/8"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727453AbfAUJMW (ORCPT + 24 others); Mon, 21 Jan 2019 04:12:22 -0500 Received: from mail-lj1-f195.google.com ([209.85.208.195]:33080 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727426AbfAUJMV (ORCPT ); Mon, 21 Jan 2019 04:12:21 -0500 Received: by mail-lj1-f195.google.com with SMTP id v1-v6so16891295ljd.0 for ; Mon, 21 Jan 2019 01:12:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tj5Zx2n3TTtSndEoPHrOd/3BWc5mj7qVROmZh++CMwo=; b=ML0xuO/8ptyO2ZPo/yG8Nz3nvJ9LSsDScDmCkXzQee/YVnpXNECirx+d1ixFuTwYDp lw8OzvHHJ3Szh1YgvrLwyjj1IyE0iXmduNbFhK2BFXkYrsfpJf0eyEgHiAt9nnnBzt65 E73f+T5B/lu1U6JENvqi07nXhG24oSed7Y86A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tj5Zx2n3TTtSndEoPHrOd/3BWc5mj7qVROmZh++CMwo=; b=GSZIYcU6l7jj31ugjcUX8r9md83s2wutVTh0kVzTxUKV12YhAnYvslnBwz1n8vn1P0 r2purC81FOyvTVZQ404iyqojqR4YfC0CWI7fuKUgBGX1O0awosxS66jckpdSqsSwyZWQ rC2rRegWvi7reuWQCfviuXhdTXiNiJOUqgcH9K7djnAI5ZM62LxAL2OJJsTW/VbUpNhj rlx8UmwnPhvaPkV2ybqcNnqU56dPuC79ny6yyVQG/x/vD2Ha5yylhlxt88770Qyi84ic 6XHvMn9OigLwRKRwuZu3HBk3vovV50nZ+I22rIrzEhtdNdCiKgl1wGFRHbVp8CtfpZZQ apWA== X-Gm-Message-State: AJcUukdS4ge6Ru1gX0MzxvEwOyVboqdMfGp3jVoXaKBhfJxol+onZlhv 0NuZjTGtNPzZ1u9ZpQVZjPAJcw== X-Received: by 2002:a2e:5816:: with SMTP id m22-v6mr16720446ljb.177.1548061938888; Mon, 21 Jan 2019 01:12:18 -0800 (PST) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id j18-v6sm2131789ljc.52.2019.01.21.01.12.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Jan 2019 01:12:17 -0800 (PST) From: Linus Walleij To: Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org, Charles Keepax , Bartosz Golaszewski , Marek Szyprowski , Linus Walleij Subject: [PATCH 4/5 v9] regulator: gpio: Simplify probe path Date: Mon, 21 Jan 2019 10:12:05 +0100 Message-Id: <20190121091206.18239-4-linus.walleij@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190121091206.18239-1-linus.walleij@linaro.org> References: <20190121091206.18239-1-linus.walleij@linaro.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use devm_* managed device resources and create a local struct device *dev variable to simplify the code inside probe(). Tested-by: Marek Szyprowski Signed-off-by: Linus Walleij --- ChangeLog v8->v9: - Rebased on other changes. - Collected Marek's Tested-by. ChangeLog v7->v8: - Rebase on v5.0-rc1. ChangeLog v6->v7: - Resend with the rest. ChangeLog v3->v6: - Rebase on top of the other changes. - Change numbering to fit the rest of the series. ChangeLog v2->v3: - Resending. ChangeLog v1->v2: - Rebase the patch on the other changes. --- drivers/regulator/gpio-regulator.c | 54 ++++++++++++------------------ 1 file changed, 22 insertions(+), 32 deletions(-) -- 2.20.1 diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c index 43735704bb87..d1a9f71087da 100644 --- a/drivers/regulator/gpio-regulator.c +++ b/drivers/regulator/gpio-regulator.c @@ -228,28 +228,29 @@ static struct regulator_ops gpio_regulator_current_ops = { static int gpio_regulator_probe(struct platform_device *pdev) { - struct gpio_regulator_config *config = dev_get_platdata(&pdev->dev); - struct device_node *np = pdev->dev.of_node; + struct device *dev = &pdev->dev; + struct gpio_regulator_config *config = dev_get_platdata(dev); + struct device_node *np = dev->of_node; struct gpio_regulator_data *drvdata; struct regulator_config cfg = { }; enum gpiod_flags gflags; int ptr, ret, state, i; - drvdata = devm_kzalloc(&pdev->dev, sizeof(struct gpio_regulator_data), + drvdata = devm_kzalloc(dev, sizeof(struct gpio_regulator_data), GFP_KERNEL); if (drvdata == NULL) return -ENOMEM; if (np) { - config = of_get_gpio_regulator_config(&pdev->dev, np, + config = of_get_gpio_regulator_config(dev, np, &drvdata->desc); if (IS_ERR(config)) return PTR_ERR(config); } - drvdata->desc.name = kstrdup(config->supply_name, GFP_KERNEL); + drvdata->desc.name = devm_kstrdup(dev, config->supply_name, GFP_KERNEL); if (drvdata->desc.name == NULL) { - dev_err(&pdev->dev, "Failed to allocate supply name\n"); + dev_err(dev, "Failed to allocate supply name\n"); return -ENOMEM; } @@ -269,14 +270,14 @@ static int gpio_regulator_probe(struct platform_device *pdev) } drvdata->nr_gpios = config->ngpios; - drvdata->states = kmemdup(config->states, - config->nr_states * - sizeof(struct gpio_regulator_state), - GFP_KERNEL); + drvdata->states = devm_kmemdup(dev, + config->states, + config->nr_states * + sizeof(struct gpio_regulator_state), + GFP_KERNEL); if (drvdata->states == NULL) { - dev_err(&pdev->dev, "Failed to allocate state data\n"); - ret = -ENOMEM; - goto err_name; + dev_err(dev, "Failed to allocate state data\n"); + return -ENOMEM; } drvdata->nr_states = config->nr_states; @@ -295,9 +296,8 @@ static int gpio_regulator_probe(struct platform_device *pdev) drvdata->desc.ops = &gpio_regulator_current_ops; break; default: - dev_err(&pdev->dev, "No regulator type set\n"); - ret = -EINVAL; - goto err_memstate; + dev_err(dev, "No regulator type set\n"); + return -EINVAL; } /* build initial state from gpio init data. */ @@ -308,7 +308,7 @@ static int gpio_regulator_probe(struct platform_device *pdev) } drvdata->state = state; - cfg.dev = &pdev->dev; + cfg.dev = dev; cfg.init_data = config->init_data; cfg.driver_data = drvdata; cfg.of_node = np; @@ -322,28 +322,20 @@ static int gpio_regulator_probe(struct platform_device *pdev) else gflags = GPIOD_OUT_LOW | GPIOD_FLAGS_BIT_NONEXCLUSIVE; - cfg.ena_gpiod = gpiod_get_optional(&pdev->dev, "enable", gflags); - if (IS_ERR(cfg.ena_gpiod)) { - ret = PTR_ERR(cfg.ena_gpiod); - goto err_memstate; - } + cfg.ena_gpiod = gpiod_get_optional(dev, "enable", gflags); + if (IS_ERR(cfg.ena_gpiod)) + return PTR_ERR(cfg.ena_gpiod); drvdata->dev = regulator_register(&drvdata->desc, &cfg); if (IS_ERR(drvdata->dev)) { ret = PTR_ERR(drvdata->dev); - dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret); - goto err_memstate; + dev_err(dev, "Failed to register regulator: %d\n", ret); + return ret; } platform_set_drvdata(pdev, drvdata); return 0; - -err_memstate: - kfree(drvdata->states); -err_name: - kfree(drvdata->desc.name); - return ret; } static int gpio_regulator_remove(struct platform_device *pdev) @@ -351,8 +343,6 @@ static int gpio_regulator_remove(struct platform_device *pdev) struct gpio_regulator_data *drvdata = platform_get_drvdata(pdev); regulator_unregister(drvdata->dev); - kfree(drvdata->states); - kfree(drvdata->desc.name); return 0; }