gdrom: fix compilation error
authorChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Sun, 11 Apr 2021 22:43:30 +0000 (15:43 -0700)
committerJens Axboe <axboe@kernel.dk>
Mon, 12 Apr 2021 01:32:06 +0000 (19:32 -0600)
Use the right name for the struct request variable that removes the
following compilation error :-

make --silent --keep-going --jobs=8
O=/home/tuxbuild/.cache/tuxmake/builds/1/tmp ARCH=sh
CROSS_COMPILE=sh4-linux-gnu- 'CC=sccache sh4-linux-gnu-gcc'
'HOSTCC=sccache gcc'

In file included from /builds/linux/include/linux/scatterlist.h:9,
                 from /builds/linux/include/linux/dma-mapping.h:10,
                 from /builds/linux/drivers/cdrom/gdrom.c:16:
/builds/linux/drivers/cdrom/gdrom.c: In function 'gdrom_readdisk_dma':
/builds/linux/drivers/cdrom/gdrom.c:586:61: error: 'rq' undeclared
(first use in this function)
  586 |  __raw_writel(page_to_phys(bio_page(req->bio)) + bio_offset(rq->bio),
      |                                                             ^~

Fixes: 1d2c82001a5f ("gdrom: support highmem")
Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Tested-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/cdrom/gdrom.c

index e7717d0..742b4a0 100644 (file)
@@ -583,7 +583,7 @@ static blk_status_t gdrom_readdisk_dma(struct request *req)
        read_command->cmd[1] = 0x20;
        block = blk_rq_pos(req)/GD_TO_BLK + GD_SESSION_OFFSET;
        block_cnt = blk_rq_sectors(req)/GD_TO_BLK;
-       __raw_writel(page_to_phys(bio_page(req->bio)) + bio_offset(rq->bio),
+       __raw_writel(page_to_phys(bio_page(req->bio)) + bio_offset(req->bio),
                        GDROM_DMA_STARTADDR_REG);
        __raw_writel(block_cnt * GDROM_HARD_SECTOR, GDROM_DMA_LENGTH_REG);
        __raw_writel(1, GDROM_DMA_DIRECTION_REG);