| Message ID | 20220104133843.44272-4-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v1,1/5] nvmem: core: Remove unused devm_nvmem_unregister() | expand |
Hi Andy, andriy.shevchenko@linux.intel.com wrote on Tue, 4 Jan 2022 15:38:42 +0200: > 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> > --- > drivers/mtd/mtdcore.c | 13 ++++--------- > 1 file changed, 4 insertions(+), 9 deletions(-) > > diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c > index 70f492dce158..010ffc34532a 100644 > --- a/drivers/mtd/mtdcore.c > +++ b/drivers/mtd/mtdcore.c > @@ -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) Thanks, Miquèl
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 70f492dce158..010ffc34532a 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -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)
Since nvmem_unregister() checks for NULL, no need to repeat in the caller. Drop duplicate NULL checks. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/mtd/mtdcore.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)