Commit a2f143fc authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

rsxx: stop using ->queuedata

Instead of setting up the queuedata as well just use one private data
field.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 53042f3c
...@@ -119,7 +119,7 @@ static void bio_dma_done_cb(struct rsxx_cardinfo *card, ...@@ -119,7 +119,7 @@ static void bio_dma_done_cb(struct rsxx_cardinfo *card,
static blk_qc_t rsxx_make_request(struct request_queue *q, struct bio *bio) static blk_qc_t rsxx_make_request(struct request_queue *q, struct bio *bio)
{ {
struct rsxx_cardinfo *card = q->queuedata; struct rsxx_cardinfo *card = bio->bi_disk->private_data;
struct rsxx_bio_meta *bio_meta; struct rsxx_bio_meta *bio_meta;
blk_status_t st = BLK_STS_IOERR; blk_status_t st = BLK_STS_IOERR;
...@@ -267,8 +267,6 @@ int rsxx_setup_dev(struct rsxx_cardinfo *card) ...@@ -267,8 +267,6 @@ int rsxx_setup_dev(struct rsxx_cardinfo *card)
card->queue->limits.discard_alignment = RSXX_HW_BLK_SIZE; card->queue->limits.discard_alignment = RSXX_HW_BLK_SIZE;
} }
card->queue->queuedata = card;
snprintf(card->gendisk->disk_name, sizeof(card->gendisk->disk_name), snprintf(card->gendisk->disk_name, sizeof(card->gendisk->disk_name),
"rsxx%d", card->disk_id); "rsxx%d", card->disk_id);
card->gendisk->major = card->major; card->gendisk->major = card->major;
...@@ -289,7 +287,6 @@ void rsxx_destroy_dev(struct rsxx_cardinfo *card) ...@@ -289,7 +287,6 @@ void rsxx_destroy_dev(struct rsxx_cardinfo *card)
card->gendisk = NULL; card->gendisk = NULL;
blk_cleanup_queue(card->queue); blk_cleanup_queue(card->queue);
card->queue->queuedata = NULL;
unregister_blkdev(card->major, DRIVER_NAME); unregister_blkdev(card->major, DRIVER_NAME);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment