Skip to content

Commit

Permalink
mtd: core: Drop duplicate NULL checks around nvmem_unregister()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andy Shevchenko authored and Greg Kroah-Hartman committed Feb 21, 2022
1 parent 671aa5a commit bcf4ef2
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions drivers/mtd/mtdcore.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit bcf4ef2

Please sign in to comment.