usb: phy: 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>
Link: https://lore.kernel.org/r/20200707200040.GA4525@embeddedor
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/phy/phy-ab8500-usb.c b/drivers/usb/phy/phy-ab8500-usb.c
index 20c0f082bf9c07a8ff7665a5d2abef03d0e70221..aa4a3140394b760a38e04fce2109fdc0d3b5ad26 100644 (file)
--- a/drivers/usb/phy/phy-ab8500-usb.c
+++ b/drivers/usb/phy/phy-ab8500-usb.c
@@ -331,7 +331,7 @@ static int ab8505_usb_link_status_update(struct ab8500_usb *ab,
        switch (lsts) {
        case USB_LINK_ACA_RID_B_8505:
                event = UX500_MUSB_RIDB;
-               /* Fall through */
+               fallthrough;
        case USB_LINK_NOT_CONFIGURED_8505:
        case USB_LINK_RESERVED0_8505:
        case USB_LINK_RESERVED1_8505:
@@ -352,7 +352,7 @@ static int ab8505_usb_link_status_update(struct ab8500_usb *ab,
 
        case USB_LINK_ACA_RID_C_NM_8505:
                event = UX500_MUSB_RIDC;
-               /* Fall through */
+               fallthrough;
        case USB_LINK_STD_HOST_NC_8505:
        case USB_LINK_STD_HOST_C_NS_8505:
        case USB_LINK_STD_HOST_C_S_8505:
@@ -371,7 +371,7 @@ static int ab8505_usb_link_status_update(struct ab8500_usb *ab,
        case USB_LINK_ACA_RID_A_8505:
        case USB_LINK_ACA_DOCK_CHGR_8505:
                event = UX500_MUSB_RIDA;
-               /* Fall through */
+               fallthrough;
        case USB_LINK_HM_IDGND_8505:
                if (ab->mode == USB_IDLE) {
                        ab->mode = USB_HOST;
@@ -444,7 +444,7 @@ static int ab8500_usb_link_status_update(struct ab8500_usb *ab,
        switch (lsts) {
        case USB_LINK_ACA_RID_B_8500:
                event = UX500_MUSB_RIDB;
-               /* Fall through */
+               fallthrough;
        case USB_LINK_NOT_CONFIGURED_8500:
        case USB_LINK_NOT_VALID_LINK_8500:
                ab->mode = USB_IDLE;
@@ -461,7 +461,7 @@ static int ab8500_usb_link_status_update(struct ab8500_usb *ab,
        case USB_LINK_ACA_RID_C_HS_8500:
        case USB_LINK_ACA_RID_C_HS_CHIRP_8500:
                event = UX500_MUSB_RIDC;
-               /* Fall through */
+               fallthrough;
        case USB_LINK_STD_HOST_NC_8500:
        case USB_LINK_STD_HOST_C_NS_8500:
        case USB_LINK_STD_HOST_C_S_8500:
@@ -481,7 +481,7 @@ static int ab8500_usb_link_status_update(struct ab8500_usb *ab,
 
        case USB_LINK_ACA_RID_A_8500:
                event = UX500_MUSB_RIDA;
-               /* Fall through */
+               fallthrough;
        case USB_LINK_HM_IDGND_8500:
                if (ab->mode == USB_IDLE) {
                        ab->mode = USB_HOST;

diff --git a/drivers/usb/phy/phy-fsl-usb.c b/drivers/usb/phy/phy-fsl-usb.c
index 0c6d9f9f299462f307f75bbdcb073c9c47d8d0e4..f34c9437a182cce14d3c81a89ef2c9bad9ee593a 100644 (file)
--- a/drivers/usb/phy/phy-fsl-usb.c
+++ b/drivers/usb/phy/phy-fsl-usb.c
@@ -911,10 +911,10 @@ int usb_otg_start(struct platform_device *pdev)
                break;
        case FSL_USB2_PHY_UTMI_WIDE:
                temp |= PORTSC_PTW_16BIT;
-               /* fall through */
+               fallthrough;
        case FSL_USB2_PHY_UTMI:
                temp |= PORTSC_PTS_UTMI;
-               /* fall through */
+               fallthrough;
        default:
                break;
        }

diff --git a/drivers/usb/phy/phy-isp1301-omap.c b/drivers/usb/phy/phy-isp1301-omap.c
index 7041ba030052c47c30f4baa46424b56eb66a2d17..4a6462c92ef2c39c7a1485c7a67d08e52fd78cc3 100644 (file)
--- a/drivers/usb/phy/phy-isp1301-omap.c
+++ b/drivers/usb/phy/phy-isp1301-omap.c
@@ -581,11 +581,11 @@ pulldown:
                /* HNP failed for some reason (A_AIDL_BDIS timeout) */
                notresponding(isp);
 
-               /* FALLTHROUGH */
+               fallthrough;
        case OTG_STATE_A_VBUS_ERR:
                isp->phy.otg->state = OTG_STATE_A_WAIT_VFALL;
                pr_debug("  --> a_wait_vfall\n");
-               /* FALLTHROUGH */
+               fallthrough;
        case OTG_STATE_A_WAIT_VFALL:
                /* FIXME usbcore thinks port power is still on ... */
                clr |= OTG1_VBUS_DRV;
@@ -595,7 +595,7 @@ pulldown:
                        isp->phy.otg->state = OTG_STATE_A_WAIT_VRISE;
                        pr_debug("  --> a_wait_vrise\n");
                }
-               /* FALLTHROUGH */
+               fallthrough;
        default:
                toggle(OTG_DRV_VBUS, OTG1_VBUS_DRV);
        }
@@ -945,10 +945,10 @@ static void isp_update_otg(struct isp1301 *isp, u8 stat)
                        switch (state) {
                        case OTG_STATE_B_IDLE:
                                a_idle(isp, "idle");
-                               /* FALLTHROUGH */
+                               fallthrough;
                        case OTG_STATE_A_IDLE:
                                enable_vbus_source(isp);
-                               /* FALLTHROUGH */
+                               fallthrough;
                        case OTG_STATE_A_WAIT_VRISE:
                                /* we skip over OTG_STATE_A_WAIT_BCON, since
                                 * the HC will transition to A_HOST (or
@@ -1032,12 +1032,12 @@ static void isp_update_otg(struct isp1301 *isp, u8 stat)
                                                OTG1_DP_PULLUP);
                        dump_regs(isp, __func__);
 #endif
-                       /* FALLTHROUGH */
+                       fallthrough;
                case OTG_STATE_B_SRP_INIT:
                        b_idle(isp, __func__);
                        l = omap_readl(OTG_CTRL) & OTG_XCEIV_OUTPUTS;
                        omap_writel(l, OTG_CTRL);
-                       /* FALLTHROUGH */
+                       fallthrough;
                case OTG_STATE_B_IDLE:
                        if (otg->gadget && (isp_bstat & OTG_B_SESS_VLD)) {
 #ifdef CONFIG_USB_OTG

diff --git a/drivers/usb/phy/phy-mv-usb.c b/drivers/usb/phy/phy-mv-usb.c
index 06b47f1028b3afb69feddb91f221cc12a4435f49..ce767ecc0636641527fb304d45d39bbc34640507 100644 (file)
--- a/drivers/usb/phy/phy-mv-usb.c
+++ b/drivers/usb/phy/phy-mv-usb.c
@@ -334,7 +334,7 @@ static void mv_otg_update_state(struct mv_otg *mvotg)
        switch (old_state) {
        case OTG_STATE_UNDEFINED:
                mvotg->phy.otg->state = OTG_STATE_B_IDLE;
-               /* FALL THROUGH */
+               fallthrough;
        case OTG_STATE_B_IDLE:
                if (otg_ctrl->id == 0)
                        mvotg->phy.otg->state = OTG_STATE_A_IDLE;