simdisk: 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>

diff --git a/arch/xtensa/platforms/iss/simdisk.c b/arch/xtensa/platforms/iss/simdisk.c
index 49322b66cda931e693491e72c36d263711238606..31b5020077a0595685810aa3e07299741fc8b1a6 100644 (file)
--- 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");