drm/nouveau/bo: mark expected switch fall-through
diff mbox series

Message ID 20190211185835.GA19174@embeddedor
State Accepted
Commit 966b2217d2b94ef44c55184f99a40d48f9ad593b
Headers show
Series
  • drm/nouveau/bo: mark expected switch fall-through
Related show

Commit Message

Gustavo A. R. Silva Feb. 11, 2019, 6:58 p.m. UTC
In preparation to enabling -Wimplicit-fallthrough, mark switch
cases where we are expecting to fall through.

This patch fixes the following warning:

drivers/gpu/drm/nouveau/nouveau_bo.c: In function ‘nouveau_ttm_io_mem_reserve’:
drivers/gpu/drm/nouveau/nouveau_bo.c:1434:53: warning: this statement may fall through [-Wimplicit-fallthrough=]
   if (drm->client.mem->oclass < NVIF_CLASS_MEM_NV50 || !mem->kind)
       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~
drivers/gpu/drm/nouveau/nouveau_bo.c:1438:2: note: here
  case TTM_PL_VRAM:
  ^~~~

Warning level 3 was used: -Wimplicit-fallthrough=3

Notice that, in this particular case,  the code comment is modified
in accordance with what GCC is expecting to find.

This patch is part of the ongoing efforts to enable
-Wimplicit-fallthrough.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
 drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Gustavo A. R. Silva Feb. 15, 2019, 4:02 p.m. UTC | #1
Hi,

Please drop this, as I have included this fix into
the following patch, which addresses all the
expected fall-throughs in drivers/gpu/drm:

https://lore.kernel.org/patchwork/patch/1042856/

Thanks
--
Gustavo

On 2/11/19 12:58 PM, Gustavo A. R. Silva wrote:
> In preparation to enabling -Wimplicit-fallthrough, mark switch
> cases where we are expecting to fall through.
> 
> This patch fixes the following warning:
> 
> drivers/gpu/drm/nouveau/nouveau_bo.c: In function ‘nouveau_ttm_io_mem_reserve’:
> drivers/gpu/drm/nouveau/nouveau_bo.c:1434:53: warning: this statement may fall through [-Wimplicit-fallthrough=]
>    if (drm->client.mem->oclass < NVIF_CLASS_MEM_NV50 || !mem->kind)
>        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~
> drivers/gpu/drm/nouveau/nouveau_bo.c:1438:2: note: here
>   case TTM_PL_VRAM:
>   ^~~~
> 
> Warning level 3 was used: -Wimplicit-fallthrough=3
> 
> Notice that, in this particular case,  the code comment is modified
> in accordance with what GCC is expecting to find.
> 
> This patch is part of the ongoing efforts to enable
> -Wimplicit-fallthrough.
> 
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
> ---
>  drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
> index 73eff52036d2..a72be71c45b4 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
> @@ -1434,7 +1434,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg)
>  		if (drm->client.mem->oclass < NVIF_CLASS_MEM_NV50 || !mem->kind)
>  			/* untiled */
>  			break;
> -		/* fallthrough, tiled memory */
> +		/* fall through - tiled memory */
>  	case TTM_PL_VRAM:
>  		reg->bus.offset = reg->start << PAGE_SHIFT;
>  		reg->bus.base = device->func->resource_addr(device, 1);
>
Gustavo A. R. Silva Feb. 15, 2019, 5:30 p.m. UTC | #2
Hi all,

Alex Deucher requested me to send separate patches for each
driver, which makes this patch available to be taken,
again.

Thanks
--
Gustavo

On 2/15/19 10:02 AM, Gustavo A. R. Silva wrote:
> Hi,
> 
> Please drop this, as I have included this fix into
> the following patch, which addresses all the
> expected fall-throughs in drivers/gpu/drm:
> 
> https://lore.kernel.org/patchwork/patch/1042856/
> 
> Thanks
> --
> Gustavo
> 
> On 2/11/19 12:58 PM, Gustavo A. R. Silva wrote:
>> In preparation to enabling -Wimplicit-fallthrough, mark switch
>> cases where we are expecting to fall through.
>>
>> This patch fixes the following warning:
>>
>> drivers/gpu/drm/nouveau/nouveau_bo.c: In function ‘nouveau_ttm_io_mem_reserve’:
>> drivers/gpu/drm/nouveau/nouveau_bo.c:1434:53: warning: this statement may fall through [-Wimplicit-fallthrough=]
>>    if (drm->client.mem->oclass < NVIF_CLASS_MEM_NV50 || !mem->kind)
>>        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~
>> drivers/gpu/drm/nouveau/nouveau_bo.c:1438:2: note: here
>>   case TTM_PL_VRAM:
>>   ^~~~
>>
>> Warning level 3 was used: -Wimplicit-fallthrough=3
>>
>> Notice that, in this particular case,  the code comment is modified
>> in accordance with what GCC is expecting to find.
>>
>> This patch is part of the ongoing efforts to enable
>> -Wimplicit-fallthrough.
>>
>> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
>> ---
>>  drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
>> index 73eff52036d2..a72be71c45b4 100644
>> --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
>> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
>> @@ -1434,7 +1434,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg)
>>  		if (drm->client.mem->oclass < NVIF_CLASS_MEM_NV50 || !mem->kind)
>>  			/* untiled */
>>  			break;
>> -		/* fallthrough, tiled memory */
>> +		/* fall through - tiled memory */
>>  	case TTM_PL_VRAM:
>>  		reg->bus.offset = reg->start << PAGE_SHIFT;
>>  		reg->bus.base = device->func->resource_addr(device, 1);
>>

Patch
diff mbox series

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 73eff52036d2..a72be71c45b4 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -1434,7 +1434,7 @@  nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg)
 		if (drm->client.mem->oclass < NVIF_CLASS_MEM_NV50 || !mem->kind)
 			/* untiled */
 			break;
-		/* fallthrough, tiled memory */
+		/* fall through - tiled memory */
 	case TTM_PL_VRAM:
 		reg->bus.offset = reg->start << PAGE_SHIFT;
 		reg->bus.base = device->func->resource_addr(device, 1);