Revert "thunderbolt: Prevent crash if non-active NVMem file is read"
authorNicholas Johnson <nicholas.johnson-opensource@outlook.com.au>
Mon, 13 Apr 2020 18:04:25 +0000 (02:04 +0800)
committerMika Westerberg <mika.westerberg@linux.intel.com>
Thu, 16 Apr 2020 08:37:38 +0000 (11:37 +0300)
This reverts commit 03cd45d2e219301880cabc357e3cf478a500080f.

Commit 664f0549380c ("nvmem: core: use is_bin_visible for permissions")
incidentally adds support for write-only nvmem. Hence, this workaround
is no longer required, so drop it.

Signed-off-by: Nicholas Johnson <nicholas.johnson-opensource@outlook.com.au>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
drivers/thunderbolt/switch.c

index a2ce990..1ba4050 100644 (file)
@@ -348,12 +348,6 @@ out:
        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;
        }