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

Merge tag 'fallthrough-fixes-clang-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux

Pull fallthrough fixes from Gustavo Silva:
"Fix many fall-through warnings when building with Clang 12.0.0 and
'-Wimplicit-fallthrough' so that we at some point will be able to
enable that warning by default"

* tag 'fallthrough-fixes-clang-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux: (26 commits)
rxrpc: Fix fall-through warnings for Clang
drm/nouveau/clk: Fix fall-through warnings for Clang
drm/nouveau/therm: Fix fall-through warnings for Clang
drm/nouveau: Fix fall-through warnings for Clang
xfs: Fix fall-through warnings for Clang
xfrm: Fix fall-through warnings for Clang
tipc: Fix fall-through warnings for Clang
sctp: Fix fall-through warnings for Clang
rds: Fix fall-through warnings for Clang
net/packet: Fix fall-through warnings for Clang
net: netrom: Fix fall-through warnings for Clang
ide: Fix fall-through warnings for Clang
hwmon: (max6621) Fix fall-through warnings for Clang
hwmon: (corsair-cpro) Fix fall-through warnings for Clang
firewire: core: Fix fall-through warnings for Clang
braille_console: Fix fall-through warnings for Clang
ipv4: Fix fall-through warnings for Clang
qlcnic: Fix fall-through warnings for Clang
bnxt_en: Fix fall-through warnings for Clang
netxen_nic: Fix fall-through warnings for Clang
...

+58 -22
+1
drivers/accessibility/braille/braille_console.c
··· 246 246 beep(440); 247 247 } 248 248 } 249 + break; 249 250 case KBD_UNBOUND_KEYCODE: 250 251 case KBD_UNICODE: 251 252 case KBD_KEYSYM:
+1
drivers/atm/fore200e.c
··· 420 420 /* XXX shouldn't we *start* by deregistering the device? */ 421 421 atm_dev_deregister(fore200e->atm_dev); 422 422 423 + fallthrough; 423 424 case FORE200E_STATE_BLANK: 424 425 /* nothing to do for that state */ 425 426 break;
+1
drivers/firewire/core-topology.c
··· 58 58 case SELFID_PORT_PARENT: 59 59 case SELFID_PORT_NCONN: 60 60 (*total_port_count)++; 61 + fallthrough; 61 62 case SELFID_PORT_NONE: 62 63 break; 63 64 }
+1
drivers/gpu/drm/nouveau/nouveau_bo.c
··· 440 440 break; 441 441 case TTM_PL_TT: 442 442 error |= !(domain & NOUVEAU_GEM_DOMAIN_GART); 443 + break; 443 444 default: 444 445 break; 445 446 }
+1
drivers/gpu/drm/nouveau/nouveau_connector.c
··· 157 157 default: 158 158 break; 159 159 } 160 + break; 160 161 case DRM_MODE_SCALE_FULLSCREEN: 161 162 case DRM_MODE_SCALE_CENTER: 162 163 case DRM_MODE_SCALE_ASPECT:
+1
drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.c
··· 313 313 default: 314 314 break; 315 315 } 316 + break; 316 317 default: 317 318 break; 318 319 }
+1
drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf119.c
··· 41 41 default: 42 42 break; 43 43 } 44 + break; 44 45 default: 45 46 break; 46 47 }
+1
drivers/hwmon/corsair-cpro.c
··· 310 310 default: 311 311 break; 312 312 } 313 + break; 313 314 default: 314 315 break; 315 316 }
+1 -1
drivers/hwmon/max6621.c
··· 156 156 default: 157 157 break; 158 158 } 159 - 159 + break; 160 160 default: 161 161 break; 162 162 }
+1
drivers/net/ethernet/broadcom/bnxt/bnxt.c
··· 2184 2184 case CMPL_BASE_TYPE_HWRM_ASYNC_EVENT: 2185 2185 bnxt_async_event_process(bp, 2186 2186 (struct hwrm_async_event_cmpl *)txcmp); 2187 + break; 2187 2188 2188 2189 default: 2189 2190 break;
+1
drivers/net/ethernet/neterion/vxge/vxge-config.c
··· 3784 3784 VXGE_HW_RTS_ACCESS_STEER_DATA1_RTH_ITEM1_ENTRY_EN | 3785 3785 VXGE_HW_RTS_ACCESS_STEER_DATA1_RTH_ITEM1_BUCKET_DATA( 3786 3786 itable[j]); 3787 + return; 3787 3788 default: 3788 3789 return; 3789 3790 }
+1
drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
··· 103 103 case NFP_PORT_PF_PORT: 104 104 case NFP_PORT_VF_PORT: 105 105 nfp_repr_vnic_get_stats64(repr->port, stats); 106 + break; 106 107 default: 107 108 break; 108 109 }
+1
drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
··· 1685 1685 break; 1686 1686 case NETXEN_NIC_RESPONSE_DESC: 1687 1687 netxen_handle_fw_message(desc_cnt, consumer, sds_ring); 1688 + goto skip; 1688 1689 default: 1689 1690 goto skip; 1690 1691 }
+1
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
··· 1390 1390 break; 1391 1391 case QLCNIC_RESPONSE_DESC: 1392 1392 qlcnic_handle_fw_message(desc_cnt, consumer, sds_ring); 1393 + goto skip; 1393 1394 default: 1394 1395 goto skip; 1395 1396 }
+1
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
··· 3456 3456 adapter->fw_wait_cnt = 0; 3457 3457 return; 3458 3458 } 3459 + break; 3459 3460 case QLCNIC_DEV_FAILED: 3460 3461 break; 3461 3462 default:
+1
drivers/tee/tee_core.c
··· 452 452 case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT: 453 453 if (put_user((u64)p->u.memref.size, &up->b)) 454 454 return -EFAULT; 455 + break; 455 456 default: 456 457 break; 457 458 }
+1
drivers/watchdog/machzwd.c
··· 174 174 fallthrough; 175 175 case WD2: 176 176 zf_writeb(COUNTER_2, new > 0xff ? 0xff : new); 177 + fallthrough; 177 178 default: 178 179 return; 179 180 }
+1
fs/reiserfs/namei.c
··· 132 132 return IO_ERROR; 133 133 } 134 134 PATH_LAST_POSITION(path)--; 135 + break; 135 136 136 137 case ITEM_FOUND: 137 138 break;
+2 -2
fs/xfs/libxfs/xfs_ag_resv.c
··· 366 366 break; 367 367 default: 368 368 ASSERT(0); 369 - /* fall through */ 369 + fallthrough; 370 370 case XFS_AG_RESV_NONE: 371 371 field = args->wasdel ? XFS_TRANS_SB_RES_FDBLOCKS : 372 372 XFS_TRANS_SB_FDBLOCKS; ··· 408 408 break; 409 409 default: 410 410 ASSERT(0); 411 - /* fall through */ 411 + fallthrough; 412 412 case XFS_AG_RESV_NONE: 413 413 xfs_trans_mod_sb(tp, XFS_TRANS_SB_FDBLOCKS, (int64_t)len); 414 414 return;
+1 -1
fs/xfs/libxfs/xfs_alloc.c
··· 3174 3174 } 3175 3175 args->agbno = XFS_FSB_TO_AGBNO(mp, args->fsbno); 3176 3176 args->type = XFS_ALLOCTYPE_NEAR_BNO; 3177 - /* FALLTHROUGH */ 3177 + fallthrough; 3178 3178 case XFS_ALLOCTYPE_FIRST_AG: 3179 3179 /* 3180 3180 * Rotate through the allocation groups looking for a winner.
+1 -1
fs/xfs/libxfs/xfs_da_btree.c
··· 282 282 __this_address); 283 283 break; 284 284 } 285 - /* fall through */ 285 + fallthrough; 286 286 case XFS_DA_NODE_MAGIC: 287 287 fa = xfs_da3_node_verify(bp); 288 288 if (fa)
+1
fs/xfs/scrub/agheader.c
··· 86 86 case -ENOSYS: 87 87 case -EFBIG: 88 88 error = -EFSCORRUPTED; 89 + fallthrough; 89 90 default: 90 91 break; 91 92 }
+1 -1
fs/xfs/scrub/bmap.c
··· 271 271 case XFS_DATA_FORK: 272 272 if (xfs_is_reflink_inode(info->sc->ip)) 273 273 break; 274 - /* fall through */ 274 + fallthrough; 275 275 case XFS_ATTR_FORK: 276 276 xchk_xref_is_not_shared(info->sc, agbno, 277 277 irec->br_blockcount);
+1 -1
fs/xfs/scrub/btree.c
··· 44 44 /* Note the badness but don't abort. */ 45 45 sc->sm->sm_flags |= errflag; 46 46 *error = 0; 47 - /* fall through */ 47 + fallthrough; 48 48 default: 49 49 if (cur->bc_flags & XFS_BTREE_ROOT_IN_INODE) 50 50 trace_xchk_ifork_btree_op_error(sc, cur, level,
+3 -3
fs/xfs/scrub/common.c
··· 83 83 /* Note the badness but don't abort. */ 84 84 sc->sm->sm_flags |= errflag; 85 85 *error = 0; 86 - /* fall through */ 86 + fallthrough; 87 87 default: 88 88 trace_xchk_op_error(sc, agno, bno, *error, 89 89 ret_ip); ··· 136 136 /* Note the badness but don't abort. */ 137 137 sc->sm->sm_flags |= errflag; 138 138 *error = 0; 139 - /* fall through */ 139 + fallthrough; 140 140 default: 141 141 trace_xchk_file_op_error(sc, whichfork, offset, *error, 142 142 ret_ip); ··· 696 696 if (error) 697 697 return -ENOENT; 698 698 error = -EFSCORRUPTED; 699 - /* fall through */ 699 + fallthrough; 700 700 default: 701 701 trace_xchk_op_error(sc, 702 702 XFS_INO_TO_AGNO(mp, sc->sm->sm_ino),
+1 -1
fs/xfs/scrub/dabtree.c
··· 47 47 /* Note the badness but don't abort. */ 48 48 sc->sm->sm_flags |= XFS_SCRUB_OFLAG_CORRUPT; 49 49 *error = 0; 50 - /* fall through */ 50 + fallthrough; 51 51 default: 52 52 trace_xchk_file_op_error(sc, ds->dargs.whichfork, 53 53 xfs_dir2_da_to_db(ds->dargs.geo,
+1 -1
fs/xfs/scrub/repair.c
··· 947 947 xrep_force_quotacheck(sc, XFS_DQTYPE_GROUP); 948 948 if (XFS_IS_PQUOTA_ON(sc->mp) && !sc->ip->i_pdquot) 949 949 xrep_force_quotacheck(sc, XFS_DQTYPE_PROJ); 950 - /* fall through */ 950 + fallthrough; 951 951 case -ESRCH: 952 952 error = 0; 953 953 break;
+1 -1
fs/xfs/xfs_bmap_util.c
··· 286 286 */ 287 287 *count += btblocks - 1; 288 288 289 - /* fall through */ 289 + fallthrough; 290 290 case XFS_DINODE_FMT_EXTENTS: 291 291 *nextents = xfs_bmap_count_leaves(ifp, count); 292 292 break;
+2 -2
fs/xfs/xfs_export.c
··· 84 84 case FILEID_INO32_GEN_PARENT: 85 85 fid->i32.parent_ino = XFS_I(parent)->i_ino; 86 86 fid->i32.parent_gen = parent->i_generation; 87 - /*FALLTHRU*/ 87 + fallthrough; 88 88 case FILEID_INO32_GEN: 89 89 fid->i32.ino = XFS_I(inode)->i_ino; 90 90 fid->i32.gen = inode->i_generation; ··· 92 92 case FILEID_INO32_GEN_PARENT | XFS_FILEID_TYPE_64FLAG: 93 93 fid64->parent_ino = XFS_I(parent)->i_ino; 94 94 fid64->parent_gen = parent->i_generation; 95 - /*FALLTHRU*/ 95 + fallthrough; 96 96 case FILEID_INO32_GEN | XFS_FILEID_TYPE_64FLAG: 97 97 fid64->ino = XFS_I(inode)->i_ino; 98 98 fid64->gen = inode->i_generation;
+1 -1
fs/xfs/xfs_file.c
··· 863 863 error = xfs_break_dax_layouts(inode, &retry); 864 864 if (error || retry) 865 865 break; 866 - /* fall through */ 866 + fallthrough; 867 867 case BREAK_WRITE: 868 868 error = xfs_break_leased_layouts(inode, iolock, &retry); 869 869 break;
+1 -1
fs/xfs/xfs_inode.c
··· 877 877 xfs_inode_inherit_flags(ip, pip); 878 878 if (pip && (pip->i_diflags2 & XFS_DIFLAG2_ANY)) 879 879 xfs_inode_inherit_flags2(ip, pip); 880 - /* FALLTHROUGH */ 880 + fallthrough; 881 881 case S_IFLNK: 882 882 ip->i_df.if_format = XFS_DINODE_FMT_EXTENTS; 883 883 ip->i_df.if_bytes = 0;
+2 -2
fs/xfs/xfs_ioctl.c
··· 558 558 case ATTR_OP_REMOVE: 559 559 value = NULL; 560 560 *len = 0; 561 - /* fall through */ 561 + fallthrough; 562 562 case ATTR_OP_SET: 563 563 error = mnt_want_write_file(parfilp); 564 564 if (error) ··· 1511 1511 switch (cmd) { 1512 1512 case XFS_IOC_GETBMAPA: 1513 1513 bmx.bmv_iflags = BMV_IF_ATTRFORK; 1514 - /*FALLTHRU*/ 1514 + fallthrough; 1515 1515 case XFS_IOC_GETBMAP: 1516 1516 /* struct getbmap is a strict subset of struct getbmapx. */ 1517 1517 recsize = sizeof(struct getbmap);
+1 -1
fs/xfs/xfs_iomap.c
··· 1036 1036 prealloc_blocks = 0; 1037 1037 goto retry; 1038 1038 } 1039 - /*FALLTHRU*/ 1039 + fallthrough; 1040 1040 default: 1041 1041 goto out_unlock; 1042 1042 }
+1
fs/xfs/xfs_log.c
··· 2626 2626 case XLOG_STATE_COVER_IDLE: 2627 2627 if (iclogs_changed == 1) 2628 2628 return XLOG_STATE_COVER_IDLE; 2629 + fallthrough; 2629 2630 case XLOG_STATE_COVER_NEED: 2630 2631 case XLOG_STATE_COVER_NEED2: 2631 2632 break;
+1 -1
fs/xfs/xfs_trans_buf.c
··· 294 294 default: 295 295 if (tp && (tp->t_flags & XFS_TRANS_DIRTY)) 296 296 xfs_force_shutdown(tp->t_mountp, SHUTDOWN_META_IO_ERROR); 297 - /* fall through */ 297 + fallthrough; 298 298 case -ENOMEM: 299 299 case -EAGAIN: 300 300 return error;
+1
net/ipv4/ah4.c
··· 450 450 case ICMP_DEST_UNREACH: 451 451 if (icmp_hdr(skb)->code != ICMP_FRAG_NEEDED) 452 452 return 0; 453 + break; 453 454 case ICMP_REDIRECT: 454 455 break; 455 456 default:
+1
net/ipv4/esp4.c
··· 982 982 case ICMP_DEST_UNREACH: 983 983 if (icmp_hdr(skb)->code != ICMP_FRAG_NEEDED) 984 984 return 0; 985 + break; 985 986 case ICMP_REDIRECT: 986 987 break; 987 988 default:
+1
net/ipv4/fib_semantics.c
··· 1874 1874 (nh->fib_nh_flags & RTNH_F_DEAD)) 1875 1875 return call_fib4_notifiers(dev_net(nh->fib_nh_dev), 1876 1876 event_type, &info.info); 1877 + break; 1877 1878 default: 1878 1879 break; 1879 1880 }
+1
net/ipv4/ip_vti.c
··· 351 351 case ICMP_DEST_UNREACH: 352 352 if (icmp_hdr(skb)->code != ICMP_FRAG_NEEDED) 353 353 return 0; 354 + break; 354 355 case ICMP_REDIRECT: 355 356 break; 356 357 default:
+1
net/ipv4/ipcomp.c
··· 31 31 case ICMP_DEST_UNREACH: 32 32 if (icmp_hdr(skb)->code != ICMP_FRAG_NEEDED) 33 33 return 0; 34 + break; 34 35 case ICMP_REDIRECT: 35 36 break; 36 37 default:
+4
net/netrom/nr_route.c
··· 266 266 fallthrough; 267 267 case 2: 268 268 re_sort_routes(nr_node, 0, 1); 269 + break; 269 270 case 1: 270 271 break; 271 272 } ··· 360 359 fallthrough; 361 360 case 1: 362 361 nr_node->routes[1] = nr_node->routes[2]; 362 + fallthrough; 363 363 case 2: 364 364 break; 365 365 } ··· 484 482 fallthrough; 485 483 case 1: 486 484 s->routes[1] = s->routes[2]; 485 + break; 487 486 case 2: 488 487 break; 489 488 } ··· 532 529 fallthrough; 533 530 case 1: 534 531 t->routes[1] = t->routes[2]; 532 + break; 535 533 case 2: 536 534 break; 537 535 }
+1
net/packet/af_packet.c
··· 1656 1656 case PACKET_FANOUT_ROLLOVER: 1657 1657 if (type_flags & PACKET_FANOUT_FLAG_ROLLOVER) 1658 1658 return -EINVAL; 1659 + break; 1659 1660 case PACKET_FANOUT_HASH: 1660 1661 case PACKET_FANOUT_LB: 1661 1662 case PACKET_FANOUT_CPU:
+1
net/rds/tcp_connect.c
··· 78 78 case TCP_CLOSE_WAIT: 79 79 case TCP_CLOSE: 80 80 rds_conn_path_drop(cp, false); 81 + break; 81 82 default: 82 83 break; 83 84 }
+2
net/rds/threads.c
··· 208 208 case -ENOMEM: 209 209 rds_stats_inc(s_send_delayed_retry); 210 210 queue_delayed_work(rds_wq, &cp->cp_send_w, 2); 211 + break; 211 212 default: 212 213 break; 213 214 } ··· 233 232 case -ENOMEM: 234 233 rds_stats_inc(s_recv_delayed_retry); 235 234 queue_delayed_work(rds_wq, &cp->cp_recv_w, 2); 235 + break; 236 236 default: 237 237 break; 238 238 }
+1
net/rxrpc/af_rxrpc.c
··· 471 471 switch (rx->sk.sk_state) { 472 472 case RXRPC_UNBOUND: 473 473 rx->sk.sk_state = RXRPC_CLIENT_UNBOUND; 474 + break; 474 475 case RXRPC_CLIENT_UNBOUND: 475 476 case RXRPC_CLIENT_BOUND: 476 477 break;
+2 -1
net/sctp/input.c
··· 633 633 break; 634 634 case ICMP_REDIRECT: 635 635 sctp_icmp_redirect(sk, transport, skb); 636 - /* Fall through to out_unlock. */ 636 + goto out_unlock; 637 637 default: 638 638 goto out_unlock; 639 639 } ··· 1236 1236 net, ch, laddr, 1237 1237 sctp_hdr(skb)->source, 1238 1238 transportp); 1239 + break; 1239 1240 default: 1240 1241 break; 1241 1242 }
+1
net/tipc/link.c
··· 654 654 break; 655 655 case LINK_FAILOVER_BEGIN_EVT: 656 656 l->state = LINK_FAILINGOVER; 657 + break; 657 658 case LINK_FAILURE_EVT: 658 659 case LINK_RESET_EVT: 659 660 case LINK_ESTABLISH_EVT:
+1
net/xfrm/xfrm_interface.c
··· 432 432 case ICMP_DEST_UNREACH: 433 433 if (icmp_hdr(skb)->code != ICMP_FRAG_NEEDED) 434 434 return 0; 435 + break; 435 436 case ICMP_REDIRECT: 436 437 break; 437 438 default: