s390: use fallthrough;

Convert the various uses of fallthrough comments to fallthrough;

Done via script
Link: https://lore.kernel.org/lkml/b56602fcf79f849e733e7b521bb0e17895d390fa.1582230379.git.joe.com/
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c
index e6fca54..b295090 100644 (file)
--- a/arch/s390/kernel/signal.c
+++ b/arch/s390/kernel/signal.c
@@ -487,7 +487,7 @@ void do_signal(struct pt_regs *regs)
                                        regs->gprs[2] = -EINTR;
                                        break;
                                }
-                       /* fallthrough */
+                               fallthrough;
                        case -ERESTARTNOINTR:
                                regs->gprs[2] = regs->orig_gpr2;
                                regs->psw.addr =
@@ -514,7 +514,7 @@ void do_signal(struct pt_regs *regs)
                case -ERESTART_RESTARTBLOCK:
                        /* Restart with sys_restart_syscall */
                        regs->int_code = __NR_restart_syscall;
-               /* fallthrough */
+                       fallthrough;
                case -ERESTARTNOHAND:
                case -ERESTARTSYS:
                case -ERESTARTNOINTR:

diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index d03edeb..5f70cef 100644 (file)
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -83,7 +83,7 @@ static cpumask_t cpu_group_map(struct mask_info *info, unsigned int cpu)
                cpumask_copy(&mask, cpu_present_mask);
                break;
        default:
-               /* fallthrough */
+               fallthrough;
        case TOPOLOGY_MODE_SINGLE:
                cpumask_copy(&mask, cpumask_of(cpu));
                break;

diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 151adef..15c6c81 100644 (file)
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -122,7 +122,7 @@ static void dump_pagetable(unsigned long asce, unsigned long address)
                if (*table & _REGION_ENTRY_INVALID)
                        goto out;
                table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
-               /* fallthrough */
+               fallthrough;
        case _ASCE_TYPE_REGION2:
                table += (address & _REGION2_INDEX) >> _REGION2_SHIFT;
                if (bad_address(table))
@@ -131,7 +131,7 @@ static void dump_pagetable(unsigned long asce, unsigned long address)
                if (*table & _REGION_ENTRY_INVALID)
                        goto out;
                table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
-               /* fallthrough */
+               fallthrough;
        case _ASCE_TYPE_REGION3:
                table += (address & _REGION3_INDEX) >> _REGION3_SHIFT;
                if (bad_address(table))
@@ -140,7 +140,7 @@ static void dump_pagetable(unsigned long asce, unsigned long address)
                if (*table & (_REGION_ENTRY_INVALID | _REGION3_ENTRY_LARGE))
                        goto out;
                table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
-               /* fallthrough */
+               fallthrough;
        case _ASCE_TYPE_SEGMENT:
                table += (address & _SEGMENT_INDEX) >> _SEGMENT_SHIFT;
                if (bad_address(table))
@@ -327,7 +327,7 @@ static noinline void do_fault_error(struct pt_regs *regs, int access,
        case VM_FAULT_BADACCESS:
                if (access == VM_EXEC && signal_return(regs) == 0)
                        break;
-               /* fallthrough */
+               fallthrough;
        case VM_FAULT_BADMAP:
                /* Bad memory access. Check if it is kernel or user space. */
                if (user_mode(regs)) {
@@ -337,9 +337,8 @@ static noinline void do_fault_error(struct pt_regs *regs, int access,
                        do_sigsegv(regs, si_code);
                        break;
                }
-               /* fallthrough */
+               fallthrough;
        case VM_FAULT_BADCONTEXT:
-               /* fallthrough */
        case VM_FAULT_PFAULT:
                do_no_context(regs);
                break;

diff --git a/arch/s390/mm/pgalloc.c b/arch/s390/mm/pgalloc.c
index d3be3fe..af3bddd 100644 (file)
--- a/arch/s390/mm/pgalloc.c
+++ b/arch/s390/mm/pgalloc.c
@@ -326,7 +326,7 @@ void __tlb_remove_table(void *_table)
                mask >>= 24;
                if (mask != 0)
                        break;
-               /* fallthrough */
+               fallthrough;
        case 3:         /* 4K page table with pgstes */
                if (mask & 3)
                        atomic_xor_bits(&page->_refcount, 3 << 24);

diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index e7cf0a1..92757f9 100644 (file)
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -398,7 +398,7 @@ static void raw3215_irq(struct ccw_device *cdev, unsigned long intparm,
                }
                if (dstat == 0x08)
                        break;
-               /* else, fall through */
+               fallthrough;
        case 0x04:
                /* Device end interrupt. */
                if ((raw = req->info) == NULL)

diff --git a/drivers/s390/char/hmcdrv_ftp.c b/drivers/s390/char/hmcdrv_ftp.c
index 0e70397..37ee8f6 100644 (file)
--- a/drivers/s390/char/hmcdrv_ftp.c
+++ b/drivers/s390/char/hmcdrv_ftp.c
@@ -137,7 +137,7 @@ static int hmcdrv_ftp_parse(char *cmd, struct hmcdrv_ftp_cmdspec *ftp)
                        while ((*cmd != '\0') && !iscntrl(*cmd))
                                ++cmd;
                        ftp->fname = start;
-                       /* fall through */
+                       fallthrough;
                default:
                        *cmd = '\0';
                        break;

diff --git a/drivers/s390/char/sclp_sdias.c b/drivers/s390/char/sclp_sdias.c
index 13f97fd..644b610 100644 (file)
--- a/drivers/s390/char/sclp_sdias.c
+++ b/drivers/s390/char/sclp_sdias.c
@@ -214,7 +214,7 @@ int sclp_sdias_copy(void *dest, int start_blk, int nr_blks)
                break;
        case SDIAS_EVSTATE_NO_DATA:
                TRACE("no data\n");
-               /* fall through */
+               fallthrough;
        default:
                pr_err("Error from SCLP while copying hsa. Event status = %x\n",
                       sdias_evbuf.event_status);

diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index 3e0b2f6..380e6a6 100644 (file)
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -677,7 +677,7 @@ tape_generic_remove(struct ccw_device *cdev)
        switch (device->tape_state) {
                case TS_INIT:
                        tape_state_set(device, TS_NOT_OPER);
-                       /* fallthrough */
+                       fallthrough;
                case TS_NOT_OPER:
                        /*
                         * Nothing to do.
@@ -950,7 +950,7 @@ __tape_start_request(struct tape_device *device, struct tape_request *request)
                                break;
                        if (device->tape_state == TS_UNUSED)
                                break;
-                       /* fallthrough */
+                       fallthrough;
                default:
                        if (device->tape_state == TS_BLKUSE)
                                break;
@@ -1118,7 +1118,7 @@ __tape_do_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                        case -ETIMEDOUT:
                                DBF_LH(1, "(%08x): Request timed out\n",
                                       device->cdev_id);
-                               /* fallthrough */
+                               fallthrough;
                        case -EIO:
                                __tape_end_request(device, request, -EIO);
                                break;