Commit 569653f0 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Greg Kroah-Hartman
Browse files

nvmem: core: remove nvmem_config wp_gpio 



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: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20230127104015.23839-5-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3bd747c7

drivers/nvmem/core.c

+1 −3
Original line number Diff line number Diff line
@@ -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)) {

include/linux/nvmem-provider.h

+0 −2
Original line number Diff line number Diff line
@@ -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;