| Message ID | 20210411224330.4983-1-chaitanya.kulkarni@wdc.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | gdrom: fix compilation error | expand |
On 4/11/21 3:43 PM, Chaitanya Kulkarni wrote: > 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), > | ^~ How about adding a Fixes: tag? Thanks, Bart.
On 4/11/21 7:12 PM, Bart Van Assche wrote: > On 4/11/21 3:43 PM, Chaitanya Kulkarni wrote: >> 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), >> | ^~ > > How about adding a Fixes: tag? Indeed, that's definitely missing. I've added it and applied it.
On 4/11/21 18:33, Jens Axboe wrote: >>> 586 | __raw_writel(page_to_phys(bio_page(req->bio)) + bio_offset(rq->bio), >>> | ^~ >> How about adding a Fixes: tag? > Indeed, that's definitely missing. I've added it and applied it. > > -- Sorry about that, thanks for fixing it.
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c index e7717d090868..742b4a0932e3 100644 --- a/drivers/cdrom/gdrom.c +++ b/drivers/cdrom/gdrom.c @@ -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);
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), | ^~ 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> --- drivers/cdrom/gdrom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)