Merge tag 'nfs-for-5.11-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[linux-2.6-microblaze.git] / lib / vsprintf.c

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index afb9521..3b53c73 100644 (file)
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -940,13 +940,13 @@ char *bdev_name(char *buf, char *end, struct block_device *bdev,
 
        hd = bdev->bd_disk;
        buf = string(buf, end, hd->disk_name, spec);
-       if (bdev->bd_part->partno) {
+       if (bdev->bd_partno) {
                if (isdigit(hd->disk_name[strlen(hd->disk_name)-1])) {
                        if (buf < end)
                                *buf = 'p';
                        buf++;
                }
-               buf = number(buf, end, bdev->bd_part->partno, spec);
+               buf = number(buf, end, bdev->bd_partno, spec);
        }
        return buf;
 }
@@ -1265,7 +1265,7 @@ char *mac_address_string(char *buf, char *end, u8 *addr,
 
        case 'R':
                reversed = true;
-               /* fall through */
+               fallthrough;
 
        default:
                separator = ':';
@@ -1682,7 +1682,7 @@ char *uuid_string(char *buf, char *end, const u8 *addr,
        switch (*(++fmt)) {
        case 'L':
                uc = true;
-               /* fall through */
+               fallthrough;
        case 'l':
                index = guid_index;
                break;
@@ -2219,7 +2219,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
        case 'S':
        case 's':
                ptr = dereference_symbol_descriptor(ptr);
-               /* fall through */
+               fallthrough;
        case 'B':
                return symbol_string(buf, end, ptr, spec, fmt);
        case 'R':
@@ -2450,7 +2450,7 @@ qualifier:
 
        case 'x':
                spec->flags |= SMALL;
-               /* fall through */
+               fallthrough;
 
        case 'X':
                spec->base = 16;
@@ -2459,6 +2459,7 @@ qualifier:
        case 'd':
        case 'i':
                spec->flags |= SIGN;
+               break;
        case 'u':
                break;
 
@@ -2468,7 +2469,7 @@ qualifier:
                 * utility, treat it as any other invalid or
                 * unsupported format specifier.
                 */
-               /* fall through */
+               fallthrough;
 
        default:
                WARN_ONCE(1, "Please remove unsupported %%%c in format string\n", *fmt);
@@ -3411,10 +3412,10 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
                        break;
                case 'i':
                        base = 0;
-                       /* fall through */
+                       fallthrough;
                case 'd':
                        is_sign = true;
-                       /* fall through */
+                       fallthrough;
                case 'u':
                        break;
                case '%':