Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp436867ybt; Wed, 1 Jul 2020 02:04:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyY4rXr9ZvsL3b6y0cVwQUaekNtevkpGWSqfUsFW9BYQKE3+UddnK8zeEmtHySsxnEfhybR X-Received: by 2002:a17:906:6847:: with SMTP id a7mr21371051ejs.306.1593594242571; Wed, 01 Jul 2020 02:04:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593594242; cv=none; d=google.com; s=arc-20160816; b=f5H9SFA1I5OoZq93T8usGaneH4kJni6jMtedIYy4HO9EskRoxqo3RLgvMeJ6M1IAua a2Tbj+IbIF809mg1rknnyVWGQLY1D94HSCNuYB9y5gP1OPKeTJlxHvVkEBuR10Ct913N itmFKLHc1fAbmZ8xKDp97d6iaJ7t8gbo5kdVPbd2gJmJUIejW3HPpWXDnIspZ7btIL72 rE3FbzOU3LNhpF4+6LxzT2wzKXQxsp2xWXyTXpz1SNVbbxSJsUwxz/aB9MLSGBbbFg+D gUKy/o6CGFzGqATwoW3b+ray9nI+HQwX1Ot7FriyO4JTjIerOy8cNIl8dngg97TbxAD9 Skog== 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=mXzFKc+c1347jb3Dn9ppL+M5YgGcOuGfnfqDijAsZ3Y=; b=hSY+edvSIEZwuSEb2XuJL5VbaidPtc1o5PQxmqropURH+D3oK3EamWyubTqqwV+gFS x93DZseYO+WgQUxdgfnrPN8/XzUQ596K+6GlV24o+FVZYDza0aUutAJ8oDlXgBQ/GTB9 4qoOXlkczpqbOSc/lY1Hf8arGNYLJrVgCieUtHt+0Igpm7VLVioMDARFDGz/yE0ikvN5 BEUowH3NYoDvbY8GPPtNIp8+iX10wJDlUE/+1Ssx8SNH6aIhUzlGyBOwgWJya7/wDYhd XGZBUMfllzuI/7Xy4NDBKbpCkErwH1wVSSPqLG9w+rpPH+ZjfPJPtbmtp7aPC8DAjDyV GE2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=casper.20170209 header.b=vfpo6dKX; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o16si3623610edv.45.2020.07.01.02.03.40; Wed, 01 Jul 2020 02:04:02 -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=fail header.i=@infradead.org header.s=casper.20170209 header.b=vfpo6dKX; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729095AbgGAJAB (ORCPT + 99 others); Wed, 1 Jul 2020 05:00:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729015AbgGAI7z (ORCPT ); Wed, 1 Jul 2020 04:59:55 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5AA7C061755; Wed, 1 Jul 2020 01:59:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=mXzFKc+c1347jb3Dn9ppL+M5YgGcOuGfnfqDijAsZ3Y=; b=vfpo6dKX6pcfkXojO7MEBdP8I+ 86AaePADZXUJsTBKwuUgnpCIP5Z0XAZQGW6c/Kb9F/JPuY9WyJ3Rl/BaIzYlOubo09Ei7FzSnqQI0 gfCEMoloEjs6P3LEQnwVlzRHhUGadgcFRuv65T0aKFTLTXDZaxWyzGyBQkhXiSfyB+vRqn/1Jc5k2 zTH1Kh5OVuZJjkBVSpDk9P2/NeNvS/14c0tl9qqr7KZlHRN3w6sOvy5/jKp8AvIrsjxMcqV3gxYja FugjR0mjktszsGn1XDTbj9LDx0mg0iBf25yLxb9OisE3KCivktdJc3E9LZFZgcvuzMqVbMum3MmEs upxKYJvw==; Received: from [2001:4bb8:184:76e3:ea38:596b:3e9e:422a] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqYau-00087W-24; Wed, 01 Jul 2020 08:59:52 +0000 From: Christoph Hellwig To: Jens Axboe Cc: dm-devel@redhat.com, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-xtensa@linux-xtensa.org, drbd-dev@lists.linbit.com, linuxppc-dev@lists.ozlabs.org, linux-bcache@vger.kernel.org, linux-raid@vger.kernel.org, linux-nvdimm@lists.01.org, linux-nvme@lists.infradead.org, linux-s390@vger.kernel.org Subject: [PATCH 02/20] simdisk: stop using ->queuedata Date: Wed, 1 Jul 2020 10:59:29 +0200 Message-Id: <20200701085947.3354405-3-hch@lst.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200701085947.3354405-1-hch@lst.de> References: <20200701085947.3354405-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Instead of setting up the queuedata as well just use one private data field. Signed-off-by: Christoph Hellwig --- arch/xtensa/platforms/iss/simdisk.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/xtensa/platforms/iss/simdisk.c b/arch/xtensa/platforms/iss/simdisk.c index 49322b66cda931..31b5020077a059 100644 --- a/arch/xtensa/platforms/iss/simdisk.c +++ b/arch/xtensa/platforms/iss/simdisk.c @@ -103,7 +103,7 @@ static void simdisk_transfer(struct simdisk *dev, unsigned long sector, static blk_qc_t simdisk_make_request(struct request_queue *q, struct bio *bio) { - struct simdisk *dev = q->queuedata; + struct simdisk *dev = bio->bi_disk->private_data; struct bio_vec bvec; struct bvec_iter iter; sector_t sector = bio->bi_iter.bi_sector; @@ -273,8 +273,6 @@ static int __init simdisk_setup(struct simdisk *dev, int which, goto out_alloc_queue; } - dev->queue->queuedata = dev; - dev->gd = alloc_disk(SIMDISK_MINORS); if (dev->gd == NULL) { pr_err("alloc_disk failed\n"); -- 2.26.2