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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CDBBC47082 for ; Thu, 3 Jun 2021 15:38:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 38CA66100B for ; Thu, 3 Jun 2021 15:38:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230019AbhFCPkN (ORCPT ); Thu, 3 Jun 2021 11:40:13 -0400 Received: from mail-ua1-f42.google.com ([209.85.222.42]:33490 "EHLO mail-ua1-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230039AbhFCPkI (ORCPT ); Thu, 3 Jun 2021 11:40:08 -0400 Received: by mail-ua1-f42.google.com with SMTP id l12so3566084uai.0 for ; Thu, 03 Jun 2021 08:38:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=7DKVf+GiS9951bpd4cfEBh88PiRutTQ//wVEud26id8=; b=XGhrfqnzBbfnTVSNkFDv5GHmpnKX09udhfIYlIGvsHf5udWupM3hEeaCuAp1/iGcK2 itxazCeDLeGnN0Ew9V7mjQKrXGASjKXLT43xef2dS4qB5N1wZq329ew5d1FZXKKcqiVw 6FD/vr0CrXQkvA5Vx5CUZuiBjtgVFz1ZbiUU7kgR3MEWuPhMcO948V0XjU30zv2QSu9a tohz+jrjUWOtrbk55SyLep3Y8Ie2TFo0EIpc+U1g5ZdabSEhCf2ga/7pzz9IJem82LbC xz7dKg0/t3XaDdcBysnSaVg/DwjADlBkyj4crHUSmvNFlYRf/JXspkWoLbMUskTXooPD 5/eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=7DKVf+GiS9951bpd4cfEBh88PiRutTQ//wVEud26id8=; b=MTeD0/UJMs3CMeo8bzbpPNHUU2wVoWy+5oZFGgAF2Wdd8ly8kbcHCGZ2iGrU/H0uoL aOOacymb5BVtWjKyHYD7Kd4AfVv4GIC9n8Ee0M6GQqx2HgDwtiHjMCjkN7dnc2AQQWT1 4bJtJqPHhCcAz0Wwp6I8/HedGA1RtVvGpJwL+Mqixvn4Yn6L2MoeYrwILUm1kXUkKM9t l6YKgkZhCfp2IRtRPIBD2/BkUJ84A5MrVpVIPwtBRoNQSL0gou7jhsqcCDuPZ44dw9IC gbRbrjCA6z19BPj317ig55QqnKEuUmmYlzuO2CaY0asEnb/FlZsu5D1/0ghC50bog49M WCKA== X-Gm-Message-State: AOAM5302asatpWuxGrDnQJfvDbf5mMKWhXZg+2ISU/Q0xOFuPeaUA2/H cvXjjFovg0KZyTjaskDbUSX5RlHgakPZorpCWRkGlA== X-Google-Smtp-Source: ABdhPJyc/MDglzj7ZqHuKLnfpO6vVPHNJJJjAhghObYaMjdvGQtxzeGy+jhwPjnJIpGZowWwyMtWi1MuD2fSyYUnfEo= X-Received: by 2002:ab0:7c5b:: with SMTP id d27mr407242uaw.15.1622734642855; Thu, 03 Jun 2021 08:37:22 -0700 (PDT) MIME-Version: 1.0 References: <20210602065345.355274-1-hch@lst.de> <20210602065345.355274-9-hch@lst.de> In-Reply-To: <20210602065345.355274-9-hch@lst.de> From: Ulf Hansson Date: Thu, 3 Jun 2021 17:36:45 +0200 Message-ID: Subject: Re: [PATCH 08/30] mspro: use blk_mq_alloc_disk To: Christoph Hellwig Cc: Jens Axboe , Justin Sanders , Denis Efremov , Josef Bacik , Tim Waugh , Geoff Levand , Ilya Dryomov , "Md. Haris Iqbal" , Jack Wang , "Michael S. Tsirkin" , Jason Wang , Konrad Rzeszutek Wilk , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Mike Snitzer , Maxim Levitsky , Alex Dubov , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , dm-devel@redhat.com, linux-block , nbd@other.debian.org, linuxppc-dev , ceph-devel@vger.kernel.org, virtualization@lists.linux-foundation.org, xen-devel@lists.xenproject.org, linux-mmc , linux-mtd@lists.infradead.org, linux-s390@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org On Wed, 2 Jun 2021 at 08:54, Christoph Hellwig wrote: > > Use the blk_mq_alloc_disk API to simplify the gendisk and request_queue > allocation. > > Signed-off-by: Christoph Hellwig Acked-by: Ulf Hansson Kind regards Uffe > --- > drivers/memstick/core/mspro_block.c | 26 +++++++++++--------------- > 1 file changed, 11 insertions(+), 15 deletions(-) > > diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c > index cf7fe0d58ee7..22778d0e24f5 100644 > --- a/drivers/memstick/core/mspro_block.c > +++ b/drivers/memstick/core/mspro_block.c > @@ -1205,21 +1205,17 @@ static int mspro_block_init_disk(struct memstick_dev *card) > if (disk_id < 0) > return disk_id; > > - msb->disk = alloc_disk(1 << MSPRO_BLOCK_PART_SHIFT); > - if (!msb->disk) { > - rc = -ENOMEM; > + rc = blk_mq_alloc_sq_tag_set(&msb->tag_set, &mspro_mq_ops, 2, > + BLK_MQ_F_SHOULD_MERGE); > + if (rc) > goto out_release_id; > - } > > - msb->queue = blk_mq_init_sq_queue(&msb->tag_set, &mspro_mq_ops, 2, > - BLK_MQ_F_SHOULD_MERGE); > - if (IS_ERR(msb->queue)) { > - rc = PTR_ERR(msb->queue); > - msb->queue = NULL; > - goto out_put_disk; > + msb->disk = blk_mq_alloc_disk(&msb->tag_set, card); > + if (IS_ERR(msb->disk)) { > + rc = PTR_ERR(msb->disk); > + goto out_free_tag_set; > } > - > - msb->queue->queuedata = card; > + msb->queue = msb->disk->queue; > > blk_queue_max_hw_sectors(msb->queue, MSPRO_BLOCK_MAX_PAGES); > blk_queue_max_segments(msb->queue, MSPRO_BLOCK_MAX_SEGS); > @@ -1228,10 +1224,10 @@ static int mspro_block_init_disk(struct memstick_dev *card) > > msb->disk->major = major; > msb->disk->first_minor = disk_id << MSPRO_BLOCK_PART_SHIFT; > + msb->disk->minors = 1 << MSPRO_BLOCK_PART_SHIFT; > msb->disk->fops = &ms_block_bdops; > msb->usage_count = 1; > msb->disk->private_data = msb; > - msb->disk->queue = msb->queue; > > sprintf(msb->disk->disk_name, "mspblk%d", disk_id); > > @@ -1247,8 +1243,8 @@ static int mspro_block_init_disk(struct memstick_dev *card) > msb->active = 1; > return 0; > > -out_put_disk: > - put_disk(msb->disk); > +out_free_tag_set: > + blk_mq_free_tag_set(&msb->tag_set); > out_release_id: > mutex_lock(&mspro_block_disk_lock); > idr_remove(&mspro_block_disk_idr, disk_id); > -- > 2.30.2 >