Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp714586pxv; Thu, 15 Jul 2021 14:14:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJylfuekVvpk26biFk9qtryYfuvP0XEGezn6s38dhFcVhxZK/hVajg0J5j1oZWjxMg9RKboB X-Received: by 2002:a17:906:948f:: with SMTP id t15mr7840340ejx.281.1626383655677; Thu, 15 Jul 2021 14:14:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626383655; cv=none; d=google.com; s=arc-20160816; b=gNplSZYhLb48PvEbHnVdqtPet3/T88n8kXhWbU6L5C+jcLfDh5xdnwB/+0PhsxpETB u0u5G1Iu78oXhJf4/OvebhF/k0xrY673QyxzX/lpnCD1mjIzNFniXGNUSxbofv5NDbm0 RsnTdSyV2wl2STzZz27wHwmHFjHrbcu35HxO0LlI7j432QgGb7y6VlRArQhQ1HPxfa3a pcE1Ne/fWh6Hu0XEKMbXGpzqTji3kdlBRAgnhHkZQBkOBcXdsTSFY9IBrTgjBHwlwI4q 819WmLWqxrpMpHWRjEvDTXUe9PWlvkIU4/CxBd4anDGsJcWs3xBJZNbOusMo5u7hhS4h ZmiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=NLLNi9VXjJkWzzy68G2X0bcaGi+7hJjQeehmKMhLHEs=; b=g6PmUOGU6s858ORLZpp12FgRRqMdQMwpiDWkxX8xdk5nmCAL8z4N2z4GCQ9tvRks/k +eZVhfjK6NoCqFadqKmcplWbfC6Y5ucQcLv02UUrePBSHSaCVud1lS1VWSJBNHngUMmf qCqMuxrhddfSHO5QiqBHQK3mCOw+kroCbtS/RmxwIPlu0kjbk8XM7NWTVArUfDa4fYaX +1+P02Hr/P6u5Vv7r42foduZuHyOmPp6sV2NKI3kZNduvhcgbubiYtn1qc5Kpkl05OD/ mUKGzFRq9cPnoP5Jg4RkW0WIVAl7ooETxHFy/8lst3JkpWFzjPqtufBwhgilnDY4T7w3 SA3Q== ARC-Authentication-Results: i=1; mx.google.com; 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 j23si10706880eje.501.2021.07.15.14.13.52; Thu, 15 Jul 2021 14:14:15 -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; 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 S231561AbhGOVDL (ORCPT + 99 others); Thu, 15 Jul 2021 17:03:11 -0400 Received: from mail-pj1-f47.google.com ([209.85.216.47]:55133 "EHLO mail-pj1-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231379AbhGOVCl (ORCPT ); Thu, 15 Jul 2021 17:02:41 -0400 Received: by mail-pj1-f47.google.com with SMTP id g24so4973328pji.4; Thu, 15 Jul 2021 13:59:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NLLNi9VXjJkWzzy68G2X0bcaGi+7hJjQeehmKMhLHEs=; b=XpIG46aHcoF3tFoQIxYvONH6RM/CIpqVoZbD8MgwHuzfaW6HGajjlpvPFi0HvZEgpt DvIXpjcKYdoJ/kwr2R36fXncyK0L2xhSXtIihTN9TaUix02F8ooXeJ5Qf1Zq+Tcl7cDX Nm+Cx1WqZDuzhH3LEVLE9LyTS67Ax+m/Hc6CGhUgT8TDF6+zYbD8ci9UAU9tebnGhBp8 FSmxjwV3+xZiaoa1neyqfjFIm1gLq9b4JpEtPjTZ+UF4eCZCBOfGtJo/0tqpJ+HdLatA 08iP4UNv4GzCN2LLrVRg8AHocEQWz3Bn+tUQmABBOWM3GbYgeGwvx1u/SpO4db52CoRx qL+Q== X-Gm-Message-State: AOAM530HKI10yF88+YWRtrZtQsV7NqYZrOg3+a8EuZpChKjWoh6ifhgP OApzVyHSeF9XcQcWGdcCMSM= X-Received: by 2002:a17:90a:e288:: with SMTP id d8mr6297617pjz.226.1626382787073; Thu, 15 Jul 2021 13:59:47 -0700 (PDT) Received: from localhost ([191.96.120.37]) by smtp.gmail.com with ESMTPSA id b3sm7610292pfi.179.2021.07.15.13.59.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 15 Jul 2021 13:59:46 -0700 (PDT) From: Luis Chamberlain To: axboe@kernel.dk Cc: hare@suse.de, bvanassche@acm.org, ming.lei@redhat.com, hch@infradead.org, jack@suse.cz, osandov@fb.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [RFC 08/12] block/ataflop: use the blk_cleanup_disk() helper Date: Thu, 15 Jul 2021 13:59:16 -0700 Message-Id: <20210715205920.2023980-9-mcgrof@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210715205920.2023980-1-mcgrof@kernel.org> References: <20210715205920.2023980-1-mcgrof@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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..abb6fde0bd81 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[0]); } blk_mq_free_tag_set(&unit[i].tag_set); } -- 2.27.0