All of lore.kernel.org
 help / color / mirror / Atom feed
From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
To: gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org,
	"Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>,
	stable@vger.kernel.org,
	Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Subject: [PATCH 04/10] nvmem: core: remove nvmem_config wp_gpio
Date: Fri, 27 Jan 2023 10:40:09 +0000	[thread overview]
Message-ID: <20230127104015.23839-5-srinivas.kandagatla@linaro.org> (raw)
In-Reply-To: <20230127104015.23839-1-srinivas.kandagatla@linaro.org>

From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>

No one provides wp_gpio, so let's remove it to avoid issues with
the nvmem core putting this gpio.

Cc: stable@vger.kernel.org
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
 drivers/nvmem/core.c           | 4 +---
 include/linux/nvmem-provider.h | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 7394a7598efa..608f3ad2e2e4 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -772,9 +772,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
 
 	nvmem->id = rval;
 
-	if (config->wp_gpio)
-		nvmem->wp_gpio = config->wp_gpio;
-	else if (!config->ignore_wp)
+	if (!config->ignore_wp)
 		nvmem->wp_gpio = gpiod_get_optional(config->dev, "wp",
 						    GPIOD_OUT_HIGH);
 	if (IS_ERR(nvmem->wp_gpio)) {
diff --git a/include/linux/nvmem-provider.h b/include/linux/nvmem-provider.h
index 50caa117cb62..bb15c9234e21 100644
--- a/include/linux/nvmem-provider.h
+++ b/include/linux/nvmem-provider.h
@@ -70,7 +70,6 @@ struct nvmem_keepout {
  * @word_size:	Minimum read/write access granularity.
  * @stride:	Minimum read/write access stride.
  * @priv:	User context passed to read/write callbacks.
- * @wp-gpio:	Write protect pin
  * @ignore_wp:  Write Protect pin is managed by the provider.
  *
  * Note: A default "nvmem<id>" name will be assigned to the device if
@@ -85,7 +84,6 @@ struct nvmem_config {
 	const char		*name;
 	int			id;
 	struct module		*owner;
-	struct gpio_desc	*wp_gpio;
 	const struct nvmem_cell_info	*cells;
 	int			ncells;
 	const struct nvmem_keepout *keepout;
-- 
2.25.1


  parent reply	other threads:[~2023-01-27 10:40 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-27 10:40 [PATCH 00/10] nvmem: fixes for 6.2 Srinivas Kandagatla
2023-01-27 10:40 ` [PATCH 01/10] nvmem: brcm_nvram: Add check for kzalloc Srinivas Kandagatla
2023-01-27 10:40 ` [PATCH 02/10] nvmem: sunxi_sid: Always use 32-bit MMIO reads Srinivas Kandagatla
2023-01-27 10:40 ` [PATCH 03/10] nvmem: core: initialise nvmem->id early Srinivas Kandagatla
2023-01-27 10:40 ` Srinivas Kandagatla [this message]
2023-01-27 10:40 ` [PATCH 05/10] nvmem: core: fix cleanup after dev_set_name() Srinivas Kandagatla
2023-01-27 10:40 ` [PATCH 06/10] nvmem: core: fix registration vs use race Srinivas Kandagatla
2023-01-27 10:40 ` [PATCH 07/10] nvmem: core: fix device node refcounting Srinivas Kandagatla
2023-01-27 10:40 ` [PATCH 08/10] nvmem: core: fix cell removal on error Srinivas Kandagatla
2023-01-27 10:40 ` [PATCH 09/10] nvmem: core: fix return value Srinivas Kandagatla
2023-01-27 10:40 ` [PATCH 10/10] nvmem: qcom-spmi-sdam: fix module autoloading Srinivas Kandagatla
2023-01-28 13:39 ` [PATCH 00/10] nvmem: fixes for 6.2 Greg KH
2023-01-30 11:03   ` Srinivas Kandagatla

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230127104015.23839-5-srinivas.kandagatla@linaro.org \
    --to=srinivas.kandagatla@linaro.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rmk+kernel@armlinux.org.uk \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.