Merge tag 'pci-v5.18-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / mtd / mtdcore.c

diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index c5c3e9387647c274a62ad44614bcf0603ebffb9b..7731796024e00a71e2614b5bd50511cfb3f53ee6 100644 (file)
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -725,8 +725,7 @@ int del_mtd_device(struct mtd_info *mtd)
                debugfs_remove_recursive(mtd->dbg.dfs_dir);
 
                /* Try to remove the NVMEM provider */
-               if (mtd->nvmem)
-                       nvmem_unregister(mtd->nvmem);
+               nvmem_unregister(mtd->nvmem);
 
                device_unregister(&mtd->dev);
 
@@ -905,8 +904,7 @@ static int mtd_otp_nvmem_add(struct mtd_info *mtd)
        return 0;
 
 err:
-       if (mtd->otp_user_nvmem)
-               nvmem_unregister(mtd->otp_user_nvmem);
+       nvmem_unregister(mtd->otp_user_nvmem);
        return err;
 }
 
@@ -1010,11 +1008,8 @@ int mtd_device_unregister(struct mtd_info *master)
                memset(&master->reboot_notifier, 0, sizeof(master->reboot_notifier));
        }
 
-       if (master->otp_user_nvmem)
-               nvmem_unregister(master->otp_user_nvmem);
-
-       if (master->otp_factory_nvmem)
-               nvmem_unregister(master->otp_factory_nvmem);
+       nvmem_unregister(master->otp_user_nvmem);
+       nvmem_unregister(master->otp_factory_nvmem);
 
        err = del_mtd_partitions(master);
        if (err)