From patchwork Mon Nov 19 07:11:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 151459 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2324700ljp; Sun, 18 Nov 2018 23:14:03 -0800 (PST) X-Google-Smtp-Source: AJdET5eK5paiqEsDbup4aCh3u5dqaKJso/7E7xzbN6P7+JsWMfHD+HYt3tiLyO53Wk354sbskJdJ X-Received: by 2002:a17:902:4281:: with SMTP id h1-v6mr21316433pld.114.1542611643313; Sun, 18 Nov 2018 23:14:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542611643; cv=none; d=google.com; s=arc-20160816; b=bgxJgeqbj6qgX0QBX/iODzI5tdGWuYD85KRpysHgG92EOWkXrE4xeuibKaW3KagHV+ mPsA9dYFZ8MFqMQ3DnluNEWPUsNFb3QBTygqcJHop563dfWQnG9a4P3jTbPBv0gkaiWd Fw7VvKNx378W0DkBARV0GRJHSIMKNmDawB2+7OLN6l8TwwgnKVx1sdEvHmClZojb0HYd 506/3lsGf1X+vKo7kMsJAd6MYH2ie59gvanu7J+g3mwCXnPavou9KMcMLg4SnLwIqbiz Qpa9DH74/emRvRU4Vvg6sX3Nrl/NvSczy84clkAa04zBo/ivoCL0TOjVC+9aeG82kw39 eRbA== 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=HzVQH3GnZ9LsCDHn7VdhoAmsZdM0gU2UOjWOy4fiQsI=; b=qiyJRK5fSWdxm9nexewRq2AWaSOIIl5Mo065kCWnDuD/wqAqsh1Chx+dpI7NT1/kmp LsXR3KDaU3SvszUYMG1leOCyzPuj8KV8zJGK1KdcuufxeTsdpBbCCvJ/88fRb3VYUkP9 buZySjjncY+yR1EH0XTcS/bVc2QrKuZS7zUPorffXCBPJllgyIHHLOH/O8vLR2WLBKz6 +Mm31fGuSDkL5anJBKIQyaCckFYKGHbzAYKxI3wMBm5GfFjhmKXRhUz2BBylnRaYh5gT OgHXxgOeP2npfbMqlAYGWfBm52RIp0XRVHvMbBUXem+a6DWSdAexi5JlJr2YyDwzNk2i aB1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IkyY1tVY; 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 h1-v6si39716231pls.281.2018.11.18.23.14.03; Sun, 18 Nov 2018 23:14:03 -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=IkyY1tVY; 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 S1726540AbeKSRgq (ORCPT + 32 others); Mon, 19 Nov 2018 12:36:46 -0500 Received: from mail-lj1-f193.google.com ([209.85.208.193]:41916 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726079AbeKSRgp (ORCPT ); Mon, 19 Nov 2018 12:36:45 -0500 Received: by mail-lj1-f193.google.com with SMTP id z80-v6so25198046ljb.8 for ; Sun, 18 Nov 2018 23:13:59 -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=HzVQH3GnZ9LsCDHn7VdhoAmsZdM0gU2UOjWOy4fiQsI=; b=IkyY1tVYjgSxidfHeFLxGdGZ4JSkDBShGUQc1WVmgJkTnW+gaLlP/gm4RDsshqodjO hcvKI0yzW3rusYH+kvcqei3qdPi7nJzO9lJUaadnnmacYQzQEhWoLaZSJ89z4e0GCHw2 a+4OeU4DmMRSXc/xITvBMl+KNbD60qNW1miZo= 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=HzVQH3GnZ9LsCDHn7VdhoAmsZdM0gU2UOjWOy4fiQsI=; b=jipIGBaPkplzDJoOVHGqUXIbvGe8jiKShxln8dWWStzy4T14VZ5g8F4WceR50zKBTz 5P9qEwvePKE24AwT02r0EIMCetNg1cVZoyDTSQDpw0zHwI0dLAlmlJHs0voHPL2+2pfD LjOob7L1Paqx9m81A6cioFS/y6SOjnhl7L92/P2nQWatP4x63HDzXCMI8AE1kKwh4Lot w6UoFFpG6ZT8+nMf9BH/By3/T5y+ETmL9zm6mps0HnsI9/xR58Hg+btwgWi4oUcNzCAX 3hTNKmJ9l6OoKauWcCr+YVYusdoJci03wPFNxVvAvdQnX5S2cGdKlhJcS1gdTBH8CZz5 0foQ== X-Gm-Message-State: AGRZ1gIBUXZihHPdS9jMKKq45e5L6cYWf8jlDCrhjhTirVQhapwkGf04 ZU8P4KHV2nTaEbbuOEYWN366ag== X-Received: by 2002:a2e:2166:: with SMTP id h99-v6mr10379161ljh.53.1542611638438; Sun, 18 Nov 2018 23:13:58 -0800 (PST) Received: from localhost.localdomain (c-ae7b71d5.014-348-6c756e10.bbcust.telenor.se. [213.113.123.174]) by smtp.gmail.com with ESMTPSA id 10sm5531584lff.62.2018.11.18.23.13.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 18 Nov 2018 23:13:57 -0800 (PST) From: Linus Walleij To: Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org, Linus Walleij Subject: [PATCH 5/5 v7] regulator: core: Only support passing enable GPIO descriptors Date: Mon, 19 Nov 2018 08:11:26 +0100 Message-Id: <20181119071126.8889-5-linus.walleij@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181119071126.8889-1-linus.walleij@linaro.org> References: <20181119071126.8889-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 Now that we changed all providers to pass descriptors into the core for enable GPIOs instead of a global GPIO number, delete the support for passing GPIO numbers in, and we get a cleanup and size reduction in the core, and from a GPIO point of view we use the modern, cleaner interface. Signed-off-by: Linus Walleij --- ChangeLog v6->v7: - Resend with the rest. ChangeLog v4->v6: - Rebase on top of the other changes. - Renumber to fit the rest of the series. ChangeLog v3->v4: - Also drop ena_gpio_invert from driver data ChangeLog v2->v3: - Resending. ChangeLog v1->v2: - Rebase the patch on the other changes. --- drivers/regulator/core.c | 32 ++++++-------------------------- include/linux/regulator/driver.h | 12 +----------- 2 files changed, 7 insertions(+), 37 deletions(-) -- 2.19.1 diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 109bd2bee868..0eb5c48f1162 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -2015,35 +2014,19 @@ static int regulator_ena_gpio_request(struct regulator_dev *rdev, { struct regulator_enable_gpio *pin; struct gpio_desc *gpiod; - int ret; - if (config->ena_gpiod) - gpiod = config->ena_gpiod; - else - gpiod = gpio_to_desc(config->ena_gpio); + gpiod = config->ena_gpiod; list_for_each_entry(pin, ®ulator_ena_gpio_list, list) { if (pin->gpiod == gpiod) { - rdev_dbg(rdev, "GPIO %d is already used\n", - config->ena_gpio); + rdev_dbg(rdev, "GPIO is already used\n"); goto update_ena_gpio_to_rdev; } } - if (!config->ena_gpiod) { - ret = gpio_request_one(config->ena_gpio, - GPIOF_DIR_OUT | config->ena_gpio_flags, - rdev_get_name(rdev)); - if (ret) - return ret; - } - pin = kzalloc(sizeof(struct regulator_enable_gpio), GFP_KERNEL); - if (pin == NULL) { - if (!config->ena_gpiod) - gpio_free(config->ena_gpio); + if (pin == NULL) return -ENOMEM; - } pin->gpiod = gpiod; list_add(&pin->list, ®ulator_ena_gpio_list); @@ -2066,7 +2049,6 @@ static void regulator_ena_gpio_free(struct regulator_dev *rdev) if (pin->gpiod == rdev->ena_pin->gpiod) { if (pin->request_count <= 1) { pin->request_count = 0; - gpiod_put(pin->gpiod); list_del(&pin->list); kfree(pin); rdev->ena_pin = NULL; @@ -4336,15 +4318,13 @@ regulator_register(const struct regulator_desc *regulator_desc, goto clean; } - if (config->ena_gpiod || - ((config->ena_gpio || config->ena_gpio_initialized) && - gpio_is_valid(config->ena_gpio))) { + if (config->ena_gpiod) { mutex_lock(®ulator_list_mutex); ret = regulator_ena_gpio_request(rdev, config); mutex_unlock(®ulator_list_mutex); if (ret != 0) { - rdev_err(rdev, "Failed to request enable GPIO%d: %d\n", - config->ena_gpio, ret); + rdev_err(rdev, "Failed to request enable GPIO: %d\n", + ret); goto clean; } } diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index a9c030192147..10ee158eac00 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -400,13 +400,7 @@ struct regulator_desc { * NULL). * @regmap: regmap to use for core regmap helpers if dev_get_regmap() is * insufficient. - * @ena_gpio_initialized: GPIO controlling regulator enable was properly - * initialized, meaning that >= 0 is a valid gpio - * identifier and < 0 is a non existent gpio. - * @ena_gpio: GPIO controlling regulator enable. - * @ena_gpiod: GPIO descriptor controlling regulator enable. - * @ena_gpio_invert: Sense for GPIO enable control. - * @ena_gpio_flags: Flags to use when calling gpio_request_one() + * @ena_gpiod: GPIO controlling regulator enable. */ struct regulator_config { struct device *dev; @@ -415,11 +409,7 @@ struct regulator_config { struct device_node *of_node; struct regmap *regmap; - bool ena_gpio_initialized; - int ena_gpio; struct gpio_desc *ena_gpiod; - unsigned int ena_gpio_invert:1; - unsigned int ena_gpio_flags; }; /*