Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp4346360pxb; Mon, 27 Sep 2021 15:08:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8widBa+GQj61iVxOfFZ6x53boj2WfOYqRBzZdjf7TNltTuf1QqMg4TEiy+MzNNGS/gcZQ X-Received: by 2002:a63:8242:: with SMTP id w63mr1626690pgd.406.1632780498960; Mon, 27 Sep 2021 15:08:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632780498; cv=none; d=google.com; s=arc-20160816; b=W5MLgajnjKOSYWZ2yVp3p6AOPo0XTNQeEYm5f4LZX2PBQhpw61VJKQEqOVyq33uKJC BAxU6Ty9Y36RfPld7bo2mbMrCa3M/GLdA8eutRXbV5hJebFXBxwtbUHinAuvfwyNwSpR KWNLbdLPv5J9zlzTB/VuV6AWnIHpls2072CI2ZxOg1BZdr7foAxp9jk/MSHSMvMg4Mz6 avFvhh8IxIrfvVJRUeVbQRqRnxNUCwFfLjYtsuadb4gBMgUSU9Cx9SJhsQDMfzfNMjaC WQC4DlVia/1sPOBRaauMlu6n7K0tFCzEpEUzFLv5Vq4QCT2+mlTWFD6bGEtjRM+/nm/x eUTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=FdGB7r/+MH6CVRDebnTYZstZWp3M+pSCw3Ya01FZoLE=; b=EouLtNeVRg/cGXZ927R8XTTzsTyTdX/Z41K8f4lzacN9GRquAHnou8uC4cuYjKzDFj 6iv8Fqt5UGDObNTU3/6VeD9Fmjbzg5R31zgm4TioFlx/lZx2vCheHv2dtvTDHk7tPAJk IjKsT6BuiYOHpTEVOggx6pjZQz3m3EeMffmazBXgCkQ89cvlbjFAiEpb5IMRKlUNZjTT KGkpeGVFJqskVk8sJ4ViWz3/iAnmtj/70MRkD8FTr0YgyeF2rInYrOi34kJSqhUgZhUC UcvqqHcu2e9lUBaFVRN6eTlVot1/JutrmXBsm7fxf4jk/zVNN40Zb5kMFunnkZRNTsl3 fWtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=zwg6OSsn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j18si22028997pgk.422.2021.09.27.15.08.06; Mon, 27 Sep 2021 15:08:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=zwg6OSsn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237693AbhI0WHl (ORCPT + 99 others); Mon, 27 Sep 2021 18:07:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237635AbhI0WGi (ORCPT ); Mon, 27 Sep 2021 18:06:38 -0400 Received: from bombadil.infradead.org (unknown [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B099DC05174B; 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=FdGB7r/+MH6CVRDebnTYZstZWp3M+pSCw3Ya01FZoLE=; b=zwg6OSsnDGKEu0CbDkParc8ZVe S8pfz2lRLa7PQ/UrwpWw/JXEbsgnY10xWEgES39KlsN68N0245vFeLzyCk3UaS7SaGnzIVn0w/Il0 Tp7OzwiuMc9vBojnalPUCECfJEGkQI/Or95zoh3FVkuwhURvSOLFslU2dfe/lXKB30D3+xOklxyuC jRSfu1ZAEE+hasihE37hjOPIhvkm2HnIDFD5AYzDOJnBkBoFCv+U6FMnL1vHSzcE3Z/HoZnKHIoZ+ eJsKKx10AgCvtEbEk7MSXvN0etswMcR5UUc7Ikz3V+D6IkjqLUf9Ss9s0wApzVLqyQfKXOImyFR3M /xkg0i8w==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mUyiG-004VIg-0o; Mon, 27 Sep 2021 22:03:04 +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 11/14] block/ataflop: use the blk_cleanup_disk() helper Date: Mon, 27 Sep 2021 15:02:59 -0700 Message-Id: <20210927220302.1073499-12-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-kernel@vger.kernel.org Use the helper to replace two lines with one. Signed-off-by: Luis Chamberlain --- drivers/block/ataflop.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c index a093644ac39f..6a865d42b1fd 100644 --- a/drivers/block/ataflop.c +++ b/drivers/block/ataflop.c @@ -2076,8 +2076,7 @@ static int __init atari_floppy_init (void) err: while (--i >= 0) { - blk_cleanup_queue(unit[i].disk[0]->queue); - put_disk(unit[i].disk[0]); + blk_cleanup_disk(unit[i].disk[0]); blk_mq_free_tag_set(&unit[i].tag_set); } @@ -2135,8 +2134,7 @@ static void __exit atari_floppy_exit(void) if (!unit[i].disk[type]) continue; del_gendisk(unit[i].disk[type]); - blk_cleanup_queue(unit[i].disk[type]->queue); - put_disk(unit[i].disk[type]); + blk_cleanup_disk(unit[i].disk[type]); } blk_mq_free_tag_set(&unit[i].tag_set); } -- 2.30.2