Messages in this thread Patch in this message | | | From | Nicholas Johnson <> | Subject | [PATCH v2 3/3] Revert "thunderbolt: Prevent crash if non-active NVMem file is read" | Date | Mon, 2 Mar 2020 15:43:29 +0000 |
| |
This reverts commit 03cd45d2e219301880cabc357e3cf478a500080f.
Since NVMEM subsystem gained support for write-only instances, this workaround is no longer required, so drop it.
Signed-off-by: Nicholas Johnson <nicholas.johnson-opensource@outlook.com.au> --- drivers/thunderbolt/switch.c | 7 ------- 1 file changed, 7 deletions(-)
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c index 7d6ecc342..ad5479f21 100644 --- a/drivers/thunderbolt/switch.c +++ b/drivers/thunderbolt/switch.c @@ -348,12 +348,6 @@ static int tb_switch_nvm_read(void *priv, unsigned int offset, void *val, return ret; } -static int tb_switch_nvm_no_read(void *priv, unsigned int offset, void *val, - size_t bytes) -{ - return -EPERM; -} - static int tb_switch_nvm_write(void *priv, unsigned int offset, void *val, size_t bytes) { @@ -399,7 +393,6 @@ static struct nvmem_device *register_nvmem(struct tb_switch *sw, int id, config.read_only = true; } else { config.name = "nvm_non_active"; - config.reg_read = tb_switch_nvm_no_read; config.reg_write = tb_switch_nvm_write; config.root_only = true; } -- 2.25.1
| |