File tree Expand file tree Collapse file tree 2 files changed +1
-5
lines changed Expand file tree Collapse file tree 2 files changed +1
-5
lines changed Original file line number Diff line number Diff line change @@ -772,9 +772,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
772
772
773
773
nvmem -> id = rval ;
774
774
775
- if (config -> wp_gpio )
776
- nvmem -> wp_gpio = config -> wp_gpio ;
777
- else if (!config -> ignore_wp )
775
+ if (!config -> ignore_wp )
778
776
nvmem -> wp_gpio = gpiod_get_optional (config -> dev , "wp" ,
779
777
GPIOD_OUT_HIGH );
780
778
if (IS_ERR (nvmem -> wp_gpio )) {
Original file line number Diff line number Diff line change @@ -70,7 +70,6 @@ struct nvmem_keepout {
70
70
* @word_size: Minimum read/write access granularity.
71
71
* @stride: Minimum read/write access stride.
72
72
* @priv: User context passed to read/write callbacks.
73
- * @wp-gpio: Write protect pin
74
73
* @ignore_wp: Write Protect pin is managed by the provider.
75
74
*
76
75
* Note: A default "nvmem<id>" name will be assigned to the device if
@@ -85,7 +84,6 @@ struct nvmem_config {
85
84
const char * name ;
86
85
int id ;
87
86
struct module * owner ;
88
- struct gpio_desc * wp_gpio ;
89
87
const struct nvmem_cell_info * cells ;
90
88
int ncells ;
91
89
const struct nvmem_keepout * keepout ;
You can’t perform that action at this time.
0 commit comments