block, libnvdimm, nvme: provide a built-in blk_integrity nop profile

[mirror_ubuntu-bionic-kernel.git] / drivers / nvdimm / core.c

diff --git a/drivers/nvdimm/core.c b/drivers/nvdimm/core.c
index e85848caf8d292a672bd704d92bc64b4a63f01ff..82c49bb870555fc6636ebc30106c396807f12d7b 100644 (file)
--- a/drivers/nvdimm/core.c
+++ b/drivers/nvdimm/core.c
@@ -392,24 +392,14 @@ void nvdimm_bus_unregister(struct nvdimm_bus *nvdimm_bus)
 EXPORT_SYMBOL_GPL(nvdimm_bus_unregister);
 
 #ifdef CONFIG_BLK_DEV_INTEGRITY
-static int nd_pi_nop_generate_verify(struct blk_integrity_iter *iter)
-{
-       return 0;
-}
-
 int nd_integrity_init(struct gendisk *disk, unsigned long meta_size)
 {
        struct blk_integrity bi;
-       static struct blk_integrity_profile profile = {
-               .name = "ND-PI-NOP",
-               .generate_fn = nd_pi_nop_generate_verify,
-               .verify_fn = nd_pi_nop_generate_verify,
-       };
 
        if (meta_size == 0)
                return 0;
 
-       bi.profile = &profile;
+       bi.profile = NULL;
        bi.tuple_size = meta_size;
        bi.tag_size = meta_size;