Merge tag 'acpi-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-microblaze.git] / drivers / tty / nozomi.c

diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index d42b854..861e950 100644 (file)
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -414,11 +414,9 @@ static void read_mem32(u32 *buf, const void __iomem *mem_addr_start,
                buf16 = (u16 *) buf;
                *buf16 = __le16_to_cpu(readw(ptr));
                goto out;
-               break;
        case 4: /* 4 bytes */
                *(buf) = __le32_to_cpu(readl(ptr));
                goto out;
-               break;
        }
 
        while (i < size_bytes) {
@@ -460,15 +458,14 @@ static u32 write_mem32(void __iomem *mem_addr_start, const u32 *buf,
                buf16 = (const u16 *)buf;
                writew(__cpu_to_le16(*buf16), ptr);
                return 2;
-               break;
        case 1: /*
                 * also needs to write 4 bytes in this case
                 * so falling through..
                 */
+               fallthrough;
        case 4: /* 4 bytes */
                writel(__cpu_to_le32(*buf), ptr);
                return 4;
-               break;
        }
 
        while (i < size_bytes) {