From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934415AbcIUOb0 (ORCPT ); Wed, 21 Sep 2016 10:31:26 -0400 Received: from down.free-electrons.com ([37.187.137.238]:35154 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934344AbcIUObX (ORCPT ); Wed, 21 Sep 2016 10:31:23 -0400 Date: Wed, 21 Sep 2016 16:31:20 +0200 From: Boris Brezillon To: Daniel Walter Cc: linux-mtd@lists.infradead.org, Richard Weinberger , computersforpeace@gmail.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 03/46] mtd: Don't unconditionally unregister reboot notifier Message-ID: <20160921163120.7d7e7fca@bbrezillon> In-Reply-To: References: X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 21 Sep 2016 11:45:12 +0200 Daniel Walter wrote: > From: Richard Weinberger > > del_mtd_device() is allowed to fail. > i.e. when the MTD is busy. > Unregister the reboot notifier only when we're really > about to delete the MTD. > > Signed-off-by: Richard Weinberger > --- > drivers/mtd/mtdcore.c | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > > diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c > index e3936b8..36e5fb0 100644 > --- a/drivers/mtd/mtdcore.c > +++ b/drivers/mtd/mtdcore.c > @@ -654,17 +654,22 @@ int mtd_device_unregister(struct mtd_info *master) > { > int err; > > - if (master->_reboot) > - unregister_reboot_notifier(&master->reboot_notifier); > - > err = del_mtd_partitions(master); > if (err) > return err; > > if (!device_is_registered(&master->dev)) > - return 0; > + goto unregister; > > - return del_mtd_device(master); > + err = del_mtd_device(master); > + if (err) > + return err; > + > +unregister: > + if (master->_reboot) > + unregister_reboot_notifier(&master->reboot_notifier); > + > + return 0; How about: if (device_is_registered(&master->dev)) { err = del_mtd_device(master); if (err) return err; } if (master->_reboot) unregister_reboot_notifier(&master->reboot_notifier); return 0; This way you get rid of the unregister label, which IMHO improves readability. > } > EXPORT_SYMBOL_GPL(mtd_device_unregister); >