Commit 19186c7b authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Marcel Holtmann
Browse files

Bluetooth: core: 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: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 51c19bf3

net/bluetooth/hci_event.c

+2 −2
Original line number Diff line number Diff line
@@ -2825,7 +2825,7 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) 
		case HCI_AUTO_CONN_LINK_LOSS:

			if (ev->reason != HCI_ERROR_CONNECTION_TIMEOUT)

				break;

			/* Fall through */

			fallthrough;



		case HCI_AUTO_CONN_DIRECT:

		case HCI_AUTO_CONN_ALWAYS:
@@ -4320,7 +4320,7 @@ static void hci_sync_conn_complete_evt(struct hci_dev *hdev, 
			if (hci_setup_sync(conn, conn->link->handle))

				goto unlock;

		}

		/* fall through */

		fallthrough;



	default:

		conn->state = BT_CLOSED;

net/bluetooth/hci_sock.c

+1 −2
Original line number Diff line number Diff line
@@ -443,8 +443,7 @@ static struct sk_buff *create_monitor_event(struct hci_dev *hdev, int event) 
	case HCI_DEV_SETUP:

		if (hdev->manufacturer == 0xffff)

			return NULL;



		/* fall through */

		fallthrough;



	case HCI_DEV_UP:

		skb = bt_skb_alloc(HCI_MON_INDEX_INFO_SIZE, GFP_ATOMIC);

net/bluetooth/l2cap_core.c

+9 −10
Original line number Diff line number Diff line
@@ -666,8 +666,7 @@ void l2cap_chan_del(struct l2cap_chan *chan, int err) 


		l2cap_seq_list_free(&chan->srej_list);

		l2cap_seq_list_free(&chan->retrans_list);



		/* fall through */

		fallthrough;



	case L2CAP_MODE_STREAMING:

		skb_queue_purge(&chan->tx_q);
@@ -872,7 +871,8 @@ static inline u8 l2cap_get_auth_type(struct l2cap_chan *chan) 
			else

				return HCI_AT_NO_BONDING;

		}

		/* fall through */

		fallthrough;



	default:

		switch (chan->sec_level) {

		case BT_SECURITY_HIGH:
@@ -2983,8 +2983,7 @@ static void l2cap_tx_state_wait_f(struct l2cap_chan *chan, 
		break;

	case L2CAP_EV_RECV_REQSEQ_AND_FBIT:

		l2cap_process_reqseq(chan, control->reqseq);



		/* Fall through */

		fallthrough;



	case L2CAP_EV_RECV_FBIT:

		if (control && control->final) {
@@ -3311,7 +3310,7 @@ static inline __u8 l2cap_select_mode(__u8 mode, __u16 remote_feat_mask) 
	case L2CAP_MODE_ERTM:

		if (l2cap_mode_supported(mode, remote_feat_mask))

			return mode;

		/* fall through */

		fallthrough;

	default:

		return L2CAP_MODE_BASIC;

	}
@@ -3447,7 +3446,7 @@ static int l2cap_build_conf_req(struct l2cap_chan *chan, void *data, size_t data 
		if (__l2cap_efs_supported(chan->conn))

			set_bit(FLAG_EFS_ENABLE, &chan->flags);



		/* fall through */

		fallthrough;

	default:

		chan->mode = l2cap_select_mode(rfc.mode, chan->conn->feat_mask);

		break;
@@ -4539,7 +4538,7 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, 
				goto done;

			break;

		}

		/* fall through */

		fallthrough;



	default:

		l2cap_chan_set_err(chan, ECONNRESET);
@@ -7719,7 +7718,7 @@ static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon) 
			conn->mtu = hcon->hdev->le_mtu;

			break;

		}

		/* fall through */

		fallthrough;

	default:

		conn->mtu = hcon->hdev->acl_mtu;

		break;
@@ -7841,7 +7840,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, 
	case L2CAP_MODE_STREAMING:

		if (!disable_ertm)

			break;

		/* fall through */

		fallthrough;

	default:

		err = -EOPNOTSUPP;

		goto done;

net/bluetooth/l2cap_sock.c

+2 −2
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static int l2cap_sock_listen(struct socket *sock, int backlog) 
	case L2CAP_MODE_STREAMING:

		if (!disable_ertm)

			break;

		/* fall through */

		fallthrough;

	default:

		err = -EOPNOTSUPP;

		goto done;
@@ -760,7 +760,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, 
		case L2CAP_MODE_STREAMING:

			if (!disable_ertm)

				break;

			/* fall through */

			fallthrough;

		default:

			err = -EINVAL;

			break;

net/bluetooth/mgmt.c

+2 −2
Original line number Diff line number Diff line
@@ -4525,7 +4525,7 @@ static bool discovery_type_is_valid(struct hci_dev *hdev, uint8_t type, 
		*mgmt_status = mgmt_le_support(hdev);

		if (*mgmt_status)

			return false;

		/* Intentional fall-through */

		fallthrough;

	case DISCOV_TYPE_BREDR:

		*mgmt_status = mgmt_bredr_support(hdev);

		if (*mgmt_status)
@@ -5901,7 +5901,7 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev, 
		case MGMT_LTK_P256_DEBUG:

			authenticated = 0x00;

			type = SMP_LTK_P256_DEBUG;

			/* fall through */

			fallthrough;

		default:

			continue;

		}