From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2AADC433EF for ; Mon, 10 Jan 2022 08:12:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239690AbiAJIMN convert rfc822-to-8bit (ORCPT ); Mon, 10 Jan 2022 03:12:13 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:52341 "EHLO relay3-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239741AbiAJIMG (ORCPT ); Mon, 10 Jan 2022 03:12:06 -0500 Received: (Authenticated sender: miquel.raynal@bootlin.com) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id CEEFE60004; Mon, 10 Jan 2022 08:11:58 +0000 (UTC) Date: Mon, 10 Jan 2022 09:11:57 +0100 From: Miquel Raynal To: Andy Shevchenko Cc: Srinivas Kandagatla , Greg Kroah-Hartman , Mika Westerberg , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Richard Weinberger , Vignesh Raghavendra , Andreas Noever , Michael Jamet , Yehezkel Bernat , Alexander Usyskin Subject: Re: [PATCH v1 4/5] mtd: core: Drop duplicate NULL checks around nvmem_unregister() Message-ID: <20220110091157.6396569e@xps13> In-Reply-To: <20220104133843.44272-4-andriy.shevchenko@linux.intel.com> References: <20220104133843.44272-1-andriy.shevchenko@linux.intel.com> <20220104133843.44272-4-andriy.shevchenko@linux.intel.com> Organization: Bootlin X-Mailer: Claws Mail 3.17.7 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org 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 > > Signed-off-by: Andy Shevchenko > --- > 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