pktcdvd: stop setting q->queuedata

The two users can get the private data from the gendisk with one less
pointer dereference, and we can drop the useless q parameter from
pkt_make_request_write.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20240222073647.3776769-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index abb82926b1c93597b9fef9c75296b258c3cac74c..0cd65b27c197176e3fa08dfcc49109051ac72bf7 100644 (file)
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -2338,9 +2338,9 @@ static void pkt_make_request_read(struct pktcdvd_device *pd, struct bio *bio)
        pkt_queue_bio(pd, cloned_bio);
 }
 
-static void pkt_make_request_write(struct request_queue *q, struct bio *bio)
+static void pkt_make_request_write(struct bio *bio)
 {
-       struct pktcdvd_device *pd = q->queuedata;
+       struct pktcdvd_device *pd = bio->bi_bdev->bd_disk->private_data;
        sector_t zone;
        struct packet_data *pkt;
        int was_empty, blocked_bio;
@@ -2432,7 +2432,7 @@ static void pkt_make_request_write(struct request_queue *q, struct bio *bio)
 
 static void pkt_submit_bio(struct bio *bio)
 {
-       struct pktcdvd_device *pd = bio->bi_bdev->bd_disk->queue->queuedata;
+       struct pktcdvd_device *pd = bio->bi_bdev->bd_disk->private_data;
        struct device *ddev = disk_to_dev(pd->disk);
        struct bio *split;
 
@@ -2476,7 +2476,7 @@ static void pkt_submit_bio(struct bio *bio)
                        split = bio;
                }
 
-               pkt_make_request_write(bio->bi_bdev->bd_disk->queue, split);
+               pkt_make_request_write(split);
        } while (split != bio);
 
        return;
@@ -2490,7 +2490,6 @@ static void pkt_init_queue(struct pktcdvd_device *pd)
 
        blk_queue_logical_block_size(q, CD_FRAMESIZE);
        blk_queue_max_hw_sectors(q, PACKET_MAX_SECTORS);
-       q->queuedata = pd;
 }
 
 static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)