UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mtd: core: Drop duplicate NULL checks around nvmem_unregister() 

Since nvmem_unregister() checks for NULL, no need to repeat in
the caller. Drop duplicate NULL checks.

Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220220151527.17216-13-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andy Shevchenko 2022-02-20 15:15:26 +00:00 committed by Greg Kroah-Hartman
parent 671aa5a4d4
commit bcf4ef28b0
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/mtd/mtdcore.c
View File

@ -742,8 +742,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);
@ -921,8 +920,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;
}
@ -1026,11 +1024,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)