aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/emu
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-07-01 10:59:28 +0200
committerJens Axboe <axboe@kernel.dk>2020-07-01 07:27:23 -0600
commit6d41bb4d466f1695215debc4046d3907e2d7d784 (patch)
tree20f4cb0b9fa123c2f7a0af5e859f682ca4d9ad3d /arch/m68k/emu
parentblk-mq: remove pointless call of list_entry_rq() in hctx_show_busy_rq() (diff)
downloadlinux-dev-6d41bb4d466f1695215debc4046d3907e2d7d784.tar.xz
linux-dev-6d41bb4d466f1695215debc4046d3907e2d7d784.zip
nfblock: stop using ->queuedata
Instead of setting up the queuedata as well just use one private data field. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'arch/m68k/emu')
-rw-r--r--arch/m68k/emu/nfblock.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/m68k/emu/nfblock.c b/arch/m68k/emu/nfblock.c
index c3a630440512..87e8b1700acd 100644
--- a/arch/m68k/emu/nfblock.c
+++ b/arch/m68k/emu/nfblock.c
@@ -61,7 +61,7 @@ struct nfhd_device {
static blk_qc_t nfhd_make_request(struct request_queue *queue, struct bio *bio)
{
- struct nfhd_device *dev = queue->queuedata;
+ struct nfhd_device *dev = bio->bi_disk->private_data;
struct bio_vec bvec;
struct bvec_iter iter;
int dir, len, shift;
@@ -122,7 +122,6 @@ static int __init nfhd_init_one(int id, u32 blocks, u32 bsize)
if (dev->queue == NULL)
goto free_dev;
- dev->queue->queuedata = dev;
blk_queue_logical_block_size(dev->queue, bsize);
dev->disk = alloc_disk(16);