On Thu, Mar 12, 2020 at 12:17:12PM -0700, Joe Perches wrote: > Convert /* fallthrough */ style comments to fallthrough; > > Convert the various uses of fallthrough comments to fallthrough; > > Done via script > Link: https://lore.kernel.org/lkml/b56602fcf79f849e733e7b521bb0e17895d390fa.1582230379.git.joe@xxxxxxxxxxx/ > > And by hand: > > This file has a fallthrough comment outside of an #ifdef block > that causes gcc to emit a warning if converted in-place. > > So move the new fallthrough; inside the containing #ifdef/#endif too. > > Signed-off-by: Joe Perches <joe@xxxxxxxxxxx> Acked-by: Daniel Vetter <daniel.vetter@xxxxxxxx> I'm assuming this all lands through a special pull? Or should I apply this? -Daniel > --- > drivers/gpu/drm/drm_vm.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c > index 64619f..fd65c59 100644 > --- a/drivers/gpu/drm/drm_vm.c > +++ b/drivers/gpu/drm/drm_vm.c > @@ -595,8 +595,8 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) > vma->vm_ops = &drm_vm_ops; > break; > } > + fallthrough; /* to _DRM_FRAME_BUFFER... */ > #endif > - /* fall through - to _DRM_FRAME_BUFFER... */ > case _DRM_FRAME_BUFFER: > case _DRM_REGISTERS: > offset = drm_core_get_reg_ofs(dev); > @@ -621,7 +621,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) > vma->vm_end - vma->vm_start, vma->vm_page_prot)) > return -EAGAIN; > vma->vm_page_prot = drm_dma_prot(map->type, vma); > - /* fall through - to _DRM_SHM */ > + fallthrough; /* to _DRM_SHM */ > case _DRM_SHM: > vma->vm_ops = &drm_vm_shm_ops; > vma->vm_private_data = (void *)map; > -- > 2.24.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
