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 0AFCBC43219 for ; Mon, 27 Sep 2021 22:05:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DF98A611C0 for ; Mon, 27 Sep 2021 22:05:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238276AbhI0WHT (ORCPT ); Mon, 27 Sep 2021 18:07:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238267AbhI0WGg (ORCPT ); Mon, 27 Sep 2021 18:06:36 -0400 Received: from bombadil.infradead.org (unknown [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 769D2C051748; Mon, 27 Sep 2021 15:03:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=j1BgpbxfWBb8S5GPA1YHKp60xgsz7a/bFSDeN785DO8=; b=ZS6mMaRYhkKa+8qyEPQm4AL8n+ QH80J+Htnpb96SoY/roT3K27ui2F+bosvqyBD5zp0XABbQMLpXClJbWfIYnaHfRIls2cLK9X2VuWL s5U5ZKgdKLGDc/DHdruqQQzOSWXdX3SFbFUo63idYHDrIEtqi23mTzCzA7ZKNjgDWDh4/Bs8bO99O hNVBPOybKEnhnDCLAnNMHaDcO5Vy7iOcqsd4OVyiicm/yfGPCEHelG8+Uphkic88eBdxM70uxz4NR iOrYUJdjFZT1mO2JEmy1ohmHKAUyHeAezT9pEgKpq/qbS1QHaeWKsSFf1ll85Js/Ke1ji/NPTOgKD t/cWYiSA==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mUyiF-004VIT-R0; Mon, 27 Sep 2021 22:03:03 +0000 From: Luis Chamberlain To: axboe@kernel.dk, efremov@linux.com, hch@lst.de Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH v2 09/14] swim: add a floppy registration bool which triggers del_gendisk() Date: Mon, 27 Sep 2021 15:02:57 -0700 Message-Id: <20210927220302.1073499-10-mcgrof@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210927220302.1073499-1-mcgrof@kernel.org> References: <20210927220302.1073499-1-mcgrof@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Luis Chamberlain Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Instead of calling del_gendisk() on exit alone, let's add a registration bool to the floppy disk state, this way this can be done on the shared caller, swim_cleanup_floppy_disk(). This will be more useful in subsequent patches. Right now, this just shuffles functionality out to a helper in a safe way. Signed-off-by: Luis Chamberlain --- drivers/block/swim.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/block/swim.c b/drivers/block/swim.c index 3deb9d9a59c0..b3ee3dad5a8c 100644 --- a/drivers/block/swim.c +++ b/drivers/block/swim.c @@ -184,6 +184,7 @@ struct floppy_state { int track; int ref_count; + bool registered; struct gendisk *disk; struct blk_mq_tag_set tag_set; @@ -778,6 +779,9 @@ static void swim_cleanup_floppy_disk(struct floppy_state *fs) if (!disk) return; + if (fs->registered) + del_gendisk(fs->disk); + blk_cleanup_disk(disk); blk_mq_free_tag_set(&fs->tag_set); } @@ -839,6 +843,7 @@ static int swim_floppy_init(struct swim_priv *swd) swd->unit[drive].disk->private_data = &swd->unit[drive]; set_capacity(swd->unit[drive].disk, 2880); add_disk(swd->unit[drive].disk); + swd->unit[drive].registered = true; } return 0; @@ -915,10 +920,8 @@ static int swim_remove(struct platform_device *dev) int drive; struct resource *res; - for (drive = 0; drive < swd->floppy_count; drive++) { - del_gendisk(swd->unit[drive].disk); + for (drive = 0; drive < swd->floppy_count; drive++) swim_cleanup_floppy_disk(&swd->unit[drive]); - } unregister_blkdev(FLOPPY_MAJOR, "fd"); -- 2.30.2