Bluetooth: 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: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/bcm203x.c b/drivers/bluetooth/bcm203x.c
index 3b17625..e667933 100644 (file)
--- a/drivers/bluetooth/bcm203x.c
+++ b/drivers/bluetooth/bcm203x.c
@@ -106,7 +106,7 @@ static void bcm203x_complete(struct urb *urb)
                }
 
                data->state = BCM203X_LOAD_FIRMWARE;
-               /* fall through */
+               fallthrough;
        case BCM203X_LOAD_FIRMWARE:
                if (data->fw_sent == data->fw_size) {
                        usb_fill_int_urb(urb, udev, usb_rcvintpipe(udev, BCM203X_IN_EP),

diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index cc6e562..36eabf6 100644 (file)
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -295,7 +295,6 @@ static void bluecard_write_wakeup(struct bluecard_info *info)
                                baud_reg = REG_CONTROL_BAUD_RATE_115200;
                                break;
                        case PKT_BAUD_RATE_57600:
-                               /* Fall through... */
                        default:
                                baud_reg = REG_CONTROL_BAUD_RATE_57600;
                                break;
@@ -585,7 +584,6 @@ static int bluecard_hci_set_baud_rate(struct hci_dev *hdev, int baud)
                hci_skb_pkt_type(skb) = PKT_BAUD_RATE_115200;
                break;
        case 57600:
-               /* Fall through... */
        default:
                cmd[4] = 0x03;
                hci_skb_pkt_type(skb) = PKT_BAUD_RATE_57600;

diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c
index d9a4c6c..8bfe024 100644 (file)
--- a/drivers/bluetooth/hci_ll.c
+++ b/drivers/bluetooth/hci_ll.c
@@ -219,7 +219,7 @@ static void ll_device_want_to_wakeup(struct hci_uart *hu)
                 * perfectly safe to always send one.
                 */
                BT_DBG("dual wake-up-indication");
-               /* fall through */
+               fallthrough;
        case HCILL_ASLEEP:
                /* acknowledge device wake up */
                if (send_hcill_cmd(HCILL_WAKE_UP_ACK, hu) < 0) {

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index 99d14c7..7e39546 100644 (file)
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -472,8 +472,6 @@ static void hci_ibs_tx_idle_timeout(struct timer_list *t)
 
        case HCI_IBS_TX_ASLEEP:
        case HCI_IBS_TX_WAKING:
-               /* Fall through */
-
        default:
                BT_ERR("Spurious timeout tx state %d", qca->tx_ibs_state);
                break;
@@ -516,8 +514,6 @@ static void hci_ibs_wake_retrans_timeout(struct timer_list *t)
 
        case HCI_IBS_TX_ASLEEP:
        case HCI_IBS_TX_AWAKE:
-               /* Fall through */
-
        default:
                BT_ERR("Spurious timeout tx state %d", qca->tx_ibs_state);
                break;
@@ -835,8 +831,6 @@ static void device_woke_up(struct hci_uart *hu)
                break;
 
        case HCI_IBS_TX_ASLEEP:
-               /* Fall through */
-
        default:
                BT_ERR("Received HCI_IBS_WAKE_ACK in tx state %d",
                       qca->tx_ibs_state);
@@ -2072,7 +2066,7 @@ static int __maybe_unused qca_suspend(struct device *dev)
        switch (qca->tx_ibs_state) {
        case HCI_IBS_TX_WAKING:
                del_timer(&qca->wake_retrans_timer);
-               /* Fall through */
+               fallthrough;
        case HCI_IBS_TX_AWAKE:
                del_timer(&qca->tx_idle_timer);