Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fbdev: Use fallthrough pseudo-keyword

Replace the existing /* fall through */ comments and its variants with
the new pseudo-keyword macro fallthrough[1]. Also, remove unnecessary
fall-through markings when it is the case.

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html?highlight=fallthrough#implicit-switch-case-fall-through

Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200707210539.GA12530@embeddedor

authored by

Gustavo A. R. Silva and committed by
Sam Ravnborg
ad04fae0 85806f6d

+46 -47
+1 -1
drivers/video/fbdev/acornfb.c
··· 857 857 case 'M': 858 858 case 'm': 859 859 size *= 1024; 860 - /* Fall through */ 860 + fallthrough; 861 861 case 'K': 862 862 case 'k': 863 863 size *= 1024;
+1 -1
drivers/video/fbdev/arcfb.c
··· 419 419 schedule(); 420 420 finish_wait(&arcfb_waitq, &wait); 421 421 } 422 - /* fall through */ 422 + fallthrough; 423 423 424 424 case FBIO_GETCONTROL2: 425 425 {
+2 -2
drivers/video/fbdev/atmel_lcdfb.c
··· 508 508 case 32: 509 509 var->transp.offset = 24; 510 510 var->transp.length = 8; 511 - /* fall through */ 511 + fallthrough; 512 512 case 24: 513 513 if (pdata->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) { 514 514 /* RGB:888 mode */ ··· 633 633 case 2: value |= ATMEL_LCDC_PIXELSIZE_2; break; 634 634 case 4: value |= ATMEL_LCDC_PIXELSIZE_4; break; 635 635 case 8: value |= ATMEL_LCDC_PIXELSIZE_8; break; 636 - case 15: /* fall through */ 636 + case 15: fallthrough; 637 637 case 16: value |= ATMEL_LCDC_PIXELSIZE_16; break; 638 638 case 24: value |= ATMEL_LCDC_PIXELSIZE_24; break; 639 639 case 32: value |= ATMEL_LCDC_PIXELSIZE_32; break;
+3 -3
drivers/video/fbdev/aty/radeon_pm.c
··· 1208 1208 case 1: 1209 1209 if (mc & 0x4) 1210 1210 break; 1211 - /* fall through */ 1211 + fallthrough; 1212 1212 case 2: 1213 1213 dll_sleep_mask |= MDLL_R300_RDCK__MRDCKB_SLEEP; 1214 1214 dll_reset_mask |= MDLL_R300_RDCK__MRDCKB_RESET; 1215 - /* fall through */ 1215 + fallthrough; 1216 1216 case 0: 1217 1217 dll_sleep_mask |= MDLL_R300_RDCK__MRDCKA_SLEEP; 1218 1218 dll_reset_mask |= MDLL_R300_RDCK__MRDCKA_RESET; ··· 1221 1221 case 1: 1222 1222 if (!(mc & 0x4)) 1223 1223 break; 1224 - /* fall through */ 1224 + fallthrough; 1225 1225 case 2: 1226 1226 dll_sleep_mask |= MDLL_R300_RDCK__MRDCKD_SLEEP; 1227 1227 dll_reset_mask |= MDLL_R300_RDCK__MRDCKD_RESET;
+2 -2
drivers/video/fbdev/cirrusfb.c
··· 1476 1476 mdelay(100); 1477 1477 /* mode */ 1478 1478 vga_wgfx(cinfo->regbase, CL_GR31, 0x00); 1479 - /* fall through */ 1479 + fallthrough; 1480 1480 case BT_GD5480: 1481 1481 /* from Klaus' NetBSD driver: */ 1482 1482 vga_wgfx(cinfo->regbase, CL_GR2F, 0x00); 1483 - /* fall through */ 1483 + fallthrough; 1484 1484 case BT_ALPINE: 1485 1485 /* put blitter into 542x compat */ 1486 1486 vga_wgfx(cinfo->regbase, CL_GR33, 0x00);
+1 -1
drivers/video/fbdev/controlfb.c
··· 713 713 break; 714 714 case FB_BLANK_POWERDOWN: 715 715 ctrl &= ~0x33; 716 - /* fall through */ 716 + fallthrough; 717 717 case FB_BLANK_NORMAL: 718 718 ctrl |= 0x400; 719 719 break;
+1 -1
drivers/video/fbdev/core/fbmem.c
··· 1310 1310 case FBIOGET_CON2FBMAP: 1311 1311 case FBIOPUT_CON2FBMAP: 1312 1312 arg = (unsigned long) compat_ptr(arg); 1313 - /* fall through */ 1313 + fallthrough; 1314 1314 case FBIOBLANK: 1315 1315 ret = do_fb_ioctl(info, cmd, arg); 1316 1316 break;
+2 -2
drivers/video/fbdev/fsl-diu-fb.c
··· 1287 1287 dev_warn(info->dev, 1288 1288 "MFB_SET_PIXFMT value of 0x%08x is deprecated.\n", 1289 1289 MFB_SET_PIXFMT_OLD); 1290 - /* fall through */ 1290 + fallthrough; 1291 1291 case MFB_SET_PIXFMT: 1292 1292 if (copy_from_user(&pix_fmt, buf, sizeof(pix_fmt))) 1293 1293 return -EFAULT; ··· 1297 1297 dev_warn(info->dev, 1298 1298 "MFB_GET_PIXFMT value of 0x%08x is deprecated.\n", 1299 1299 MFB_GET_PIXFMT_OLD); 1300 - /* fall through */ 1300 + fallthrough; 1301 1301 case MFB_GET_PIXFMT: 1302 1302 pix_fmt = ad->pix_fmt; 1303 1303 if (copy_to_user(buf, &pix_fmt, sizeof(pix_fmt)))
+1 -1
drivers/video/fbdev/gxt4500.c
··· 534 534 break; 535 535 case DFA_PIX_32BIT: 536 536 val |= (reg << 24); 537 - /* fall through */ 537 + fallthrough; 538 538 case DFA_PIX_24BIT: 539 539 val |= (reg << 16) | (reg << 8); 540 540 break;
+1 -1
drivers/video/fbdev/i740fb.c
··· 430 430 break; 431 431 case 9 ... 15: 432 432 bpp = 15; 433 - /* fall through */ 433 + fallthrough; 434 434 case 16: 435 435 if ((1000000 / var->pixclock) > DACSPEED16) { 436 436 dev_err(info->device, "requested pixclock %i MHz out of range (max. %i MHz at 15/16bpp)\n",
+2 -2
drivers/video/fbdev/offb.c
··· 141 141 /* Clear PALETTE_ACCESS_CNTL in DAC_CNTL */ 142 142 out_le32(par->cmap_adr + 0x58, 143 143 in_le32(par->cmap_adr + 0x58) & ~0x20); 144 - /* fall through */ 144 + fallthrough; 145 145 case cmap_r128: 146 146 /* Set palette index & data */ 147 147 out_8(par->cmap_adr + 0xb0, regno); ··· 211 211 /* Clear PALETTE_ACCESS_CNTL in DAC_CNTL */ 212 212 out_le32(par->cmap_adr + 0x58, 213 213 in_le32(par->cmap_adr + 0x58) & ~0x20); 214 - /* fall through */ 214 + fallthrough; 215 215 case cmap_r128: 216 216 /* Set palette index & data */ 217 217 out_8(par->cmap_adr + 0xb0, i);
+2 -2
drivers/video/fbdev/omap/lcdc.c
··· 328 328 lcdc.bpp = 12; 329 329 break; 330 330 } 331 - /* fallthrough */ 331 + fallthrough; 332 332 case OMAPFB_COLOR_YUV422: 333 333 if (lcdc.ext_mode) { 334 334 lcdc.bpp = 16; 335 335 break; 336 336 } 337 - /* fallthrough */ 337 + fallthrough; 338 338 default: 339 339 /* FIXME: other BPPs. 340 340 * bpp1: code 0, size 256
+10 -10
drivers/video/fbdev/omap/omapfb_main.c
··· 253 253 if (fbdev->ctrl->setcolreg) 254 254 r = fbdev->ctrl->setcolreg(regno, red, green, blue, 255 255 transp, update_hw_pal); 256 - /* Fallthrough */ 256 + fallthrough; 257 257 case OMAPFB_COLOR_RGB565: 258 258 case OMAPFB_COLOR_RGB444: 259 259 if (r != 0) ··· 443 443 return 0; 444 444 case 12: 445 445 var->bits_per_pixel = 16; 446 - /* fall through */ 446 + fallthrough; 447 447 case 16: 448 448 if (plane->fbdev->panel->bpp == 12) 449 449 plane->color_mode = OMAPFB_COLOR_RGB444; ··· 1531 1531 case OMAPFB_ACTIVE: 1532 1532 for (i = 0; i < fbdev->mem_desc.region_cnt; i++) 1533 1533 unregister_framebuffer(fbdev->fb_info[i]); 1534 - /* fall through */ 1534 + fallthrough; 1535 1535 case 7: 1536 1536 omapfb_unregister_sysfs(fbdev); 1537 - /* fall through */ 1537 + fallthrough; 1538 1538 case 6: 1539 1539 if (fbdev->panel->disable) 1540 1540 fbdev->panel->disable(fbdev->panel); 1541 - /* fall through */ 1541 + fallthrough; 1542 1542 case 5: 1543 1543 omapfb_set_update_mode(fbdev, OMAPFB_UPDATE_DISABLED); 1544 - /* fall through */ 1544 + fallthrough; 1545 1545 case 4: 1546 1546 planes_cleanup(fbdev); 1547 - /* fall through */ 1547 + fallthrough; 1548 1548 case 3: 1549 1549 ctrl_cleanup(fbdev); 1550 - /* fall through */ 1550 + fallthrough; 1551 1551 case 2: 1552 1552 if (fbdev->panel->cleanup) 1553 1553 fbdev->panel->cleanup(fbdev->panel); 1554 - /* fall through */ 1554 + fallthrough; 1555 1555 case 1: 1556 1556 dev_set_drvdata(fbdev->dev, NULL); 1557 1557 kfree(fbdev); ··· 1854 1854 case 'm': 1855 1855 case 'M': 1856 1856 vram *= 1024; 1857 - /* Fall through */ 1857 + fallthrough; 1858 1858 case 'k': 1859 1859 case 'K': 1860 1860 vram *= 1024;
+2 -2
drivers/video/fbdev/omap2/omapfb/dss/dispc.c
··· 1861 1861 if (color_mode == OMAP_DSS_COLOR_YUV2 || 1862 1862 color_mode == OMAP_DSS_COLOR_UYVY) 1863 1863 width = width >> 1; 1864 - /* fall through */ 1864 + fallthrough; 1865 1865 case OMAP_DSS_ROT_90: 1866 1866 case OMAP_DSS_ROT_270: 1867 1867 *offset1 = 0; ··· 1884 1884 if (color_mode == OMAP_DSS_COLOR_YUV2 || 1885 1885 color_mode == OMAP_DSS_COLOR_UYVY) 1886 1886 width = width >> 1; 1887 - /* fall through */ 1887 + fallthrough; 1888 1888 case OMAP_DSS_ROT_90 + 4: 1889 1889 case OMAP_DSS_ROT_270 + 4: 1890 1890 *offset1 = 0;
+1 -1
drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c
··· 760 760 r = -ENODEV; 761 761 break; 762 762 } 763 - /* FALLTHROUGH */ 763 + fallthrough; 764 764 765 765 case OMAPFB_WAITFORVSYNC: 766 766 DBG("ioctl WAITFORVSYNC\n");
+1 -1
drivers/video/fbdev/omap2/omapfb/omapfb-main.c
··· 882 882 / (var->bits_per_pixel >> 2); 883 883 break; 884 884 } 885 - /* fall through */ 885 + fallthrough; 886 886 default: 887 887 screen_width = fix->line_length / (var->bits_per_pixel >> 3); 888 888 break;
+2 -2
drivers/video/fbdev/pm2fb.c
··· 233 233 switch (bpp) { 234 234 case 24: 235 235 timing *= 3; 236 - /* fall through */ 236 + fallthrough; 237 237 case 8: 238 238 timing >>= 1; 239 - /* fall through */ 239 + fallthrough; 240 240 case 16: 241 241 timing >>= 1; 242 242 case 32:
+1 -1
drivers/video/fbdev/pxafb.c
··· 1614 1614 */ 1615 1615 if (old_state != C_DISABLE_PM) 1616 1616 break; 1617 - /* fall through */ 1617 + fallthrough; 1618 1618 1619 1619 case C_ENABLE: 1620 1620 /*
+3 -3
drivers/video/fbdev/s3c-fb.c
··· 284 284 /* 666 with one bit alpha/transparency */ 285 285 var->transp.offset = 18; 286 286 var->transp.length = 1; 287 - /* fall through */ 287 + fallthrough; 288 288 case 18: 289 289 var->bits_per_pixel = 32; 290 290 ··· 312 312 case 25: 313 313 var->transp.length = var->bits_per_pixel - 24; 314 314 var->transp.offset = 24; 315 - /* fall through */ 315 + fallthrough; 316 316 case 24: 317 317 /* our 24bpp is unpacked, so 32bpp */ 318 318 var->bits_per_pixel = 32; ··· 809 809 case FB_BLANK_POWERDOWN: 810 810 wincon &= ~WINCONx_ENWIN; 811 811 sfb->enabled &= ~(1 << index); 812 - /* fall through - to FB_BLANK_NORMAL */ 812 + fallthrough; /* to FB_BLANK_NORMAL */ 813 813 814 814 case FB_BLANK_NORMAL: 815 815 /* disable the DMA and display 0x0 (black) */
+1 -1
drivers/video/fbdev/sa1100fb.c
··· 935 935 */ 936 936 if (old_state != C_DISABLE_PM) 937 937 break; 938 - /* fall through */ 938 + fallthrough; 939 939 940 940 case C_ENABLE: 941 941 /*
+1 -2
drivers/video/fbdev/savage/savagefb_driver.c
··· 1859 1859 vga_out8(0x3d4, 0x68, par); /* memory control 1 */ 1860 1860 if ((vga_in8(0x3d5, par) & 0xC0) == (0x01 << 6)) 1861 1861 RamSavage4[1] = 8; 1862 - 1863 - /*FALLTHROUGH*/ 1862 + fallthrough; 1864 1863 1865 1864 case S3_SAVAGE2000: 1866 1865 videoRam = RamSavage4[(config1 & 0xE0) >> 5] * 1024;
+2 -2
drivers/video/fbdev/sh_mobile_lcdcfb.c
··· 1594 1594 case V4L2_PIX_FMT_NV12: 1595 1595 case V4L2_PIX_FMT_NV21: 1596 1596 info->fix.ypanstep = 2; 1597 - /* Fall through */ 1597 + fallthrough; 1598 1598 case V4L2_PIX_FMT_NV16: 1599 1599 case V4L2_PIX_FMT_NV61: 1600 1600 info->fix.xpanstep = 2; ··· 2085 2085 case V4L2_PIX_FMT_NV12: 2086 2086 case V4L2_PIX_FMT_NV21: 2087 2087 info->fix.ypanstep = 2; 2088 - /* Fall through */ 2088 + fallthrough; 2089 2089 case V4L2_PIX_FMT_NV16: 2090 2090 case V4L2_PIX_FMT_NV61: 2091 2091 info->fix.xpanstep = 2;
+1 -1
drivers/video/fbdev/sm501fb.c
··· 1005 1005 case FB_BLANK_POWERDOWN: 1006 1006 ctrl &= ~SM501_DC_CRT_CONTROL_ENABLE; 1007 1007 sm501_misc_control(fbi->dev->parent, SM501_MISC_DAC_POWER, 0); 1008 - /* fall through */ 1008 + fallthrough; 1009 1009 1010 1010 case FB_BLANK_NORMAL: 1011 1011 ctrl |= SM501_DC_CRT_CONTROL_BLANK;
+1 -1
drivers/video/fbdev/tdfxfb.c
··· 523 523 case 32: 524 524 var->transp.offset = 24; 525 525 var->transp.length = 8; 526 - /* fall through */ 526 + fallthrough; 527 527 case 24: 528 528 var->red.offset = 16; 529 529 var->green.offset = 8;
+1 -1
drivers/video/fbdev/xen-fbfront.c
··· 677 677 case XenbusStateClosed: 678 678 if (dev->state == XenbusStateClosed) 679 679 break; 680 - /* fall through - Missed the backend's CLOSING state. */ 680 + fallthrough; /* Missed the backend's CLOSING state */ 681 681 case XenbusStateClosing: 682 682 xenbus_frontend_closed(dev); 683 683 break;