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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB17DC433F5 for ; Fri, 15 Oct 2021 18:51:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 820906108B for ; Fri, 15 Oct 2021 18:51:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241961AbhJOSx4 (ORCPT ); Fri, 15 Oct 2021 14:53:56 -0400 Received: from thorn.bewilderbeest.net ([71.19.156.171]:57903 "EHLO thorn.bewilderbeest.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241925AbhJOSxy (ORCPT ); Fri, 15 Oct 2021 14:53:54 -0400 Received: from hatter.bewilderbeest.net (71-212-29-146.tukw.qwest.net [71.212.29.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: zev) by thorn.bewilderbeest.net (Postfix) with ESMTPSA id 096282B1; Fri, 15 Oct 2021 11:51:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bewilderbeest.net; s=thorn; t=1634323907; bh=AezE/UqyGxsDzy1We/7x0OMj8tS2QaSlROEBATVr1F0=; h=From:To:Cc:Subject:Date:From; b=OAwP3QFC8t9LdMSjKT+4DWtey+rZZv1PR6BpuxdwVeMh4h8gNGKqgTywyyvFYgZ0p p9LHbYylGnBdGMJCdVLQxfRmULUziwdH/ripZUncjMWZB/oST3zbwOhmLAihzOT1sQ 1CQP8/GLE9bH4gMBLnc9lWy9AbnWfnhOBDo5Qvao= From: Zev Weiss To: linux-mtd@lists.infradead.org Cc: Zev Weiss , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Michael Walle , Zhen Lei , Lee Jones , Dan Carpenter , Tian Tao , Petr Malat , Jon Hunter , linux-kernel@vger.kernel.org Subject: [PATCH] mtd: core: clear out unregistered devices a bit more Date: Fri, 15 Oct 2021 11:50:48 -0700 Message-Id: <20211015185049.3318-1-zev@bewilderbeest.net> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This allows an MTD device that has been unregistered to be easily re-registered later without triggering spurious "already registered" warnings in mtd_device_parse_register() and add_mtd_device(). Signed-off-by: Zev Weiss --- drivers/mtd/mtdcore.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 153229198947..0a0fca737d43 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -747,6 +747,9 @@ int del_mtd_device(struct mtd_info *mtd) device_unregister(&mtd->dev); + /* Clear dev so mtd can be safely re-registered later if desired */ + memset(&mtd->dev, 0, sizeof(mtd->dev)); + idr_remove(&mtd_idr, mtd->index); of_node_put(mtd_get_of_node(mtd)); @@ -1018,8 +1021,10 @@ int mtd_device_unregister(struct mtd_info *master) { int err; - if (master->_reboot) + if (master->_reboot) { unregister_reboot_notifier(&master->reboot_notifier); + memset(&master->reboot_notifier, 0, sizeof(master->reboot_notifier)); + } if (master->otp_user_nvmem) nvmem_unregister(master->otp_user_nvmem); -- 2.33.0