Re: [next] drivers/cdrom/gdrom.c:586:61: error: 'rq' undeclared (first use in this function)

[Chaitanya Kulkarni]

Naresh,

On 4/8/21 22:31, Chaitanya Kulkarni wrote:
> On 4/8/21 22:21, Naresh Kamboju wrote:
>> Linux next tag 20210408 architecture sh builds failed due to these errors.
>>
>> # to reproduce this build locally:
>>
>> 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@xxxxxxxxxx>
>>
>> Regressions found on sh:
>>   - build/gcc-9-dreamcast_defconfig
>>   - build/gcc-10-dreamcast_defconfig
>>   - build/gcc-8-dreamcast_defconfig
>>
>> --
>> Linaro LKFT
>> https://lkft.linaro.org
>>

You can try following fix and see if the error goes away.

> This can be fixed by following :-
>
> 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);
>