Commit 6f24b159 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Jason Gunthorpe
Browse files

IB/hfi1: 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/v5.7-rc7/process/deprecated.html?highlight=fallthrough#implicit-switch-case-fall-through

Link: https://lore.kernel.org/r/20200721133455.GA14363@embeddedor


Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 9b8d8469

drivers/infiniband/hw/hfi1/firmware.c

+0 −16
Original line number Diff line number Diff line
@@ -1868,11 +1868,8 @@ int parse_platform_config(struct hfi1_devdata *dd) 
									2;

				break;

			case PLATFORM_CONFIG_RX_PRESET_TABLE:

				/* fall through */

			case PLATFORM_CONFIG_TX_PRESET_TABLE:

				/* fall through */

			case PLATFORM_CONFIG_QSFP_ATTEN_TABLE:

				/* fall through */

			case PLATFORM_CONFIG_VARIABLE_SETTINGS_TABLE:

				pcfgcache->config_tables[table_type].num_table =

							table_length_dwords;
@@ -1890,15 +1887,10 @@ int parse_platform_config(struct hfi1_devdata *dd) 
			/* metadata table */

			switch (table_type) {

			case PLATFORM_CONFIG_SYSTEM_TABLE:

				/* fall through */

			case PLATFORM_CONFIG_PORT_TABLE:

				/* fall through */

			case PLATFORM_CONFIG_RX_PRESET_TABLE:

				/* fall through */

			case PLATFORM_CONFIG_TX_PRESET_TABLE:

				/* fall through */

			case PLATFORM_CONFIG_QSFP_ATTEN_TABLE:

				/* fall through */

			case PLATFORM_CONFIG_VARIABLE_SETTINGS_TABLE:

				break;

			default:
@@ -2027,15 +2019,10 @@ static int get_platform_fw_field_metadata(struct hfi1_devdata *dd, int table, 


	switch (table) {

	case PLATFORM_CONFIG_SYSTEM_TABLE:

		/* fall through */

	case PLATFORM_CONFIG_PORT_TABLE:

		/* fall through */

	case PLATFORM_CONFIG_RX_PRESET_TABLE:

		/* fall through */

	case PLATFORM_CONFIG_TX_PRESET_TABLE:

		/* fall through */

	case PLATFORM_CONFIG_QSFP_ATTEN_TABLE:

		/* fall through */

	case PLATFORM_CONFIG_VARIABLE_SETTINGS_TABLE:

		if (field && field < platform_config_table_limits[table])

			src_ptr =
@@ -2138,11 +2125,8 @@ int get_platform_config_field(struct hfi1_devdata *dd, 
			pcfgcache->config_tables[table_type].table;

		break;

	case PLATFORM_CONFIG_RX_PRESET_TABLE:

		/* fall through */

	case PLATFORM_CONFIG_TX_PRESET_TABLE:

		/* fall through */

	case PLATFORM_CONFIG_QSFP_ATTEN_TABLE:

		/* fall through */

	case PLATFORM_CONFIG_VARIABLE_SETTINGS_TABLE:

		src_ptr = pcfgcache->config_tables[table_type].table;

drivers/infiniband/hw/hfi1/mad.c

+4 −5
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ static int check_mkey(struct hfi1_ibport *ibp, struct ib_mad_hdr *mad, 
			/* Bad mkey not a violation below level 2 */

			if (ibp->rvp.mkeyprot < 2)

				break;

			/* fall through */

			fallthrough;

		case IB_MGMT_METHOD_SET:

		case IB_MGMT_METHOD_TRAP_REPRESS:

			if (ibp->rvp.mkey_violations != 0xFFFF)
@@ -1272,7 +1272,7 @@ static int set_port_states(struct hfi1_pportdata *ppd, struct opa_smp *smp, 
	case IB_PORT_NOP:

		if (phys_state == IB_PORTPHYSSTATE_NOP)

			break;

		/* FALLTHROUGH */

		fallthrough;

	case IB_PORT_DOWN:

		if (phys_state == IB_PORTPHYSSTATE_NOP) {

			link_state = HLS_DN_DOWNDEF;
@@ -2300,7 +2300,6 @@ static int __subn_set_opa_vl_arb(struct opa_smp *smp, u32 am, u8 *data, 
	 * can be changed from the default values

	 */

	case OPA_VLARB_PREEMPT_ELEMENTS:

		/* FALLTHROUGH */

	case OPA_VLARB_PREEMPT_MATRIX:

		smp->status |= IB_SMP_UNSUP_METH_ATTR;

		break;
@@ -4170,7 +4169,7 @@ static int subn_get_opa_sma(__be16 attr_id, struct opa_smp *smp, u32 am, 
			return IB_MAD_RESULT_SUCCESS | IB_MAD_RESULT_CONSUMED;

		if (ibp->rvp.port_cap_flags & IB_PORT_SM)

			return IB_MAD_RESULT_SUCCESS;

		/* FALLTHROUGH */

		fallthrough;

	default:

		smp->status |= IB_SMP_UNSUP_METH_ATTR;

		ret = reply((struct ib_mad_hdr *)smp);
@@ -4240,7 +4239,7 @@ static int subn_set_opa_sma(__be16 attr_id, struct opa_smp *smp, u32 am, 
			return IB_MAD_RESULT_SUCCESS | IB_MAD_RESULT_CONSUMED;

		if (ibp->rvp.port_cap_flags & IB_PORT_SM)

			return IB_MAD_RESULT_SUCCESS;

		/* FALLTHROUGH */

		fallthrough;

	default:

		smp->status |= IB_SMP_UNSUP_METH_ATTR;

		ret = reply((struct ib_mad_hdr *)smp);

drivers/infiniband/hw/hfi1/pio.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ void pio_send_control(struct hfi1_devdata *dd, int op) 
	switch (op) {

	case PSC_GLOBAL_ENABLE:

		reg |= SEND_CTRL_SEND_ENABLE_SMASK;

	/* Fall through */

		fallthrough;

	case PSC_DATA_VL_ENABLE:

		mask = 0;

		for (i = 0; i < ARRAY_SIZE(dd->vld); i++)

drivers/infiniband/hw/hfi1/pio_copy.c

+6 −6
Original line number Diff line number Diff line
@@ -191,22 +191,22 @@ static inline void jcopy(u8 *dest, const u8 *src, u32 n) 
	switch (n) {

	case 7:

		*dest++ = *src++;

		/* fall through */

		fallthrough;

	case 6:

		*dest++ = *src++;

		/* fall through */

		fallthrough;

	case 5:

		*dest++ = *src++;

		/* fall through */

		fallthrough;

	case 4:

		*dest++ = *src++;

		/* fall through */

		fallthrough;

	case 3:

		*dest++ = *src++;

		/* fall through */

		fallthrough;

	case 2:

		*dest++ = *src++;

		/* fall through */

		fallthrough;

	case 1:

		*dest++ = *src++;

		/* fall through */

drivers/infiniband/hw/hfi1/platform.c

+5 −5
Original line number Diff line number Diff line
@@ -668,8 +668,8 @@ static u8 aoc_low_power_setting(struct hfi1_pportdata *ppd) 


	/* active optical cables only */

	switch ((cache[QSFP_MOD_TECH_OFFS] & 0xF0) >> 4) {

	case 0x0 ... 0x9: /* fallthrough */

	case 0xC: /* fallthrough */

	case 0x0 ... 0x9: fallthrough;

	case 0xC: fallthrough;

	case 0xE:

		/* active AOC */

		power_class = get_qsfp_power_class(cache[QSFP_MOD_PWR_OFFS]);
@@ -899,8 +899,8 @@ static int tune_qsfp(struct hfi1_pportdata *ppd, 


		*ptr_tuning_method = OPA_PASSIVE_TUNING;

		break;

	case 0x0 ... 0x9: /* fallthrough */

	case 0xC: /* fallthrough */

	case 0x0 ... 0x9: fallthrough;

	case 0xC: fallthrough;

	case 0xE:

		ret = tune_active_qsfp(ppd, ptr_tx_preset, ptr_rx_preset,

				       ptr_total_atten);
@@ -909,7 +909,7 @@ static int tune_qsfp(struct hfi1_pportdata *ppd, 


		*ptr_tuning_method = OPA_ACTIVE_TUNING;

		break;

	case 0xD: /* fallthrough */

	case 0xD: fallthrough;

	case 0xF:

	default:

		dd_dev_warn(ppd->dd, "%s: Unknown/unsupported cable\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE