From patchwork Thu Nov 15 08:01:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 151200 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6691668ljp; Thu, 15 Nov 2018 00:01:53 -0800 (PST) X-Google-Smtp-Source: AJdET5fGthDuT0f4E6lmU3FGr6QCcMnb0Dni3bKiWMljym34+FW8DlE5nZJ8nUZT6ysXOaq3mX45 X-Received: by 2002:a63:9845:: with SMTP id l5mr4898617pgo.142.1542268913146; Thu, 15 Nov 2018 00:01:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542268913; cv=none; d=google.com; s=arc-20160816; b=holLcPEjrWd9HE6UZZMZaB/EUS1OtGqWNRPQhD2RWBhOLjJR9sGdwQmQSV4JFUlD6d 1xjDmHWfwc874vIwLNbssTvzfbatqcxQU8H00QJdND+/v5d7Kz8LKeU+Xr+MJzIgQJN8 kdi5Qxle/DHFpUKrifZ+3pNyMcQgPKPF0OigKvdmUHVlJybkaCEuBah6pqz8Arzv4Wzj TGzBPPDYBQMqpA9M2Xl52UfQ9JJjO9httRxqxEEjoOcUlIQoloXPqw00GbrG0wLEV4bT gsXO9Gh/i8wxlCZvZ2VU7YbkcAKEzWGqEZzDMTzOZkev5pNCBGmqDkvVPS64lmaL5gOA KLcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=+gfqSmwj4PCQXaQnUcD+g6vIf/BCYMIzR0MwhukoLZU=; b=IsWKbAO1jU4MNPGXMTImbNVEGE8tB23MX5PIVggDL0Rn2qddnPOPMf6J5auZ2RIKcR 4jfYt3akDi2pt48hTibgwimk5JgbKTVAVlcACfr6WfzcB127OJLi3tG9gZlYHnCFzRv1 ZHLkB4+j+6be2hvPvbF+YrH1WF7aC2/XAxr0rqeqAPYwKUmC+2U7WWyVCzVr5Wu+SNv3 cvOzUYlOvXsGiQkyla0FAT3D096zQFy9O8+z8SBwdrdYb7SiHPoJcftWfnkIBbY5jagB MHYw7otvLik2ev71UIGpZi7nQiTtzhBJDn6Q+YKjh77AYp4vVoPzhByYTqQKF1qKb0Aq o06w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z2u0Ex48; 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 n5si24165244pgl.485.2018.11.15.00.01.52; Thu, 15 Nov 2018 00:01:53 -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=Z2u0Ex48; 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 S1732294AbeKOSIg (ORCPT + 32 others); Thu, 15 Nov 2018 13:08:36 -0500 Received: from mail-lf1-f66.google.com ([209.85.167.66]:34122 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729065AbeKOSIf (ORCPT ); Thu, 15 Nov 2018 13:08:35 -0500 Received: by mail-lf1-f66.google.com with SMTP id p6so13472559lfc.1 for ; Thu, 15 Nov 2018 00:01:49 -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; bh=+gfqSmwj4PCQXaQnUcD+g6vIf/BCYMIzR0MwhukoLZU=; b=Z2u0Ex48BNpN+B9S+U4qmZd8niEav3tLTMNk12JHSX8sNB5tJWBexO51bFqiBtwWlc yly7B9tf8PuHmxIFsMOT/JaaIwP6fkP6njBKqzGkT8iynE56SSnM5QwTyG4gXBbVkLN9 ZC5ZR/Ie2rWsPPVXSU2lTCalRYiMt/s4SwqBA= 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; bh=+gfqSmwj4PCQXaQnUcD+g6vIf/BCYMIzR0MwhukoLZU=; b=l6PnZODu9zdxfjS04fN8CQrKyByN5T8Aq1hzEL7Gbqv4Ve5Un7F1HyLH+y1qnIqOMw Iu61eXL0Ru0tm63eGQpar0/0rilsQ2aIDpc+yK5opeI1D87xtkTDg3ok4wcRDsfHTuR0 lztHncWFJRquqYGT+Q7guqdLlNIYKNZC1gxDCts/YEmdcipI0CVJONltkIO7o9f3FsB4 /LVVN3NsXhey2RG+SqN+R1VcpDErhLYmgo9OIbfe+CsPHkmIT5SVM4CAtxbZxPk0cci8 BxcmEmMaZfdduZYJ4ChyrhW/UiLV3kM/Ph/dhvISOxDJB7Kjub1Ck+Q55AeAr8RYnSsR J5eg== X-Gm-Message-State: AGRZ1gKYKJ6KYYI05GbVVKZ/0s5e4RCVxLCStTUu5NSAfnzyScCTrrfm CYZzTCl7ZTg7rl3+BdBwNfsv9w== X-Received: by 2002:a19:ec16:: with SMTP id b22mr3023486lfa.65.1542268908112; Thu, 15 Nov 2018 00:01:48 -0800 (PST) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id o25sm4003427lfd.29.2018.11.15.00.01.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Nov 2018 00:01:47 -0800 (PST) From: Linus Walleij To: Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org, Bartosz Golaszewski , Linus Walleij Subject: [PATCH 7/8 v6] regulator: gpio: Simplify probe path Date: Thu, 15 Nov 2018 09:01:23 +0100 Message-Id: <20181115080124.7789-8-linus.walleij@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181115080124.7789-1-linus.walleij@linaro.org> References: <20181115080124.7789-1-linus.walleij@linaro.org> 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(). Signed-off-by: Linus Walleij --- 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 | 55 +++++++++++++----------------- 1 file changed, 23 insertions(+), 32 deletions(-) -- 2.17.2 diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c index 68a6c861bcad..62ddea4a5255 100644 --- a/drivers/regulator/gpio-regulator.c +++ b/drivers/regulator/gpio-regulator.c @@ -228,31 +228,33 @@ 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; } + for (i = 0; i < config->ngpios; i++) { drvdata->gpiods[i] = devm_gpiod_get_index(&pdev->dev, NULL, @@ -265,14 +267,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; @@ -291,9 +293,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. */ @@ -304,7 +305,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; @@ -318,28 +319,20 @@ static int gpio_regulator_probe(struct platform_device *pdev) else gflags = GPIOD_OUT_LOW | GPIOD_FLAGS_BIT_NONEXCLUSIVE; - cfg.ena_gpiod = devm_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 = devm_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) @@ -347,8 +340,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; }