drivers/rtc/rtc-da9055.c: remove use of regmap_irq_get_virq()

[firefly-linux-kernel-4.4.55.git] / lib / vsprintf.c

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 10909c571494893ffba0643784a115ab04267ac1..0648291cdafe8d6358914c5c2fa737c31d39704d 100644 (file)
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -364,7 +364,6 @@ enum format_type {
        FORMAT_TYPE_SHORT,
        FORMAT_TYPE_UINT,
        FORMAT_TYPE_INT,
-       FORMAT_TYPE_NRCHARS,
        FORMAT_TYPE_SIZE_T,
        FORMAT_TYPE_PTRDIFF
 };
@@ -719,10 +718,15 @@ char *resource_string(char *buf, char *end, struct resource *res,
                specp = &mem_spec;
                decode = 0;
        }
-       p = number(p, pend, res->start, *specp);
-       if (res->start != res->end) {
-               *p++ = '-';
-               p = number(p, pend, res->end, *specp);
+       if (decode && res->flags & IORESOURCE_UNSET) {
+               p = string(p, pend, "size ", str_spec);
+               p = number(p, pend, resource_size(res), *specp);
+       } else {
+               p = number(p, pend, res->start, *specp);
+               if (res->start != res->end) {
+                       *p++ = '-';
+                       p = number(p, pend, res->end, *specp);
+               }
        }
        if (decode) {
                if (res->flags & IORESOURCE_MEM_64)
@@ -1155,6 +1159,30 @@ char *netdev_feature_string(char *buf, char *end, const u8 *addr,
        return number(buf, end, *(const netdev_features_t *)addr, spec);
 }
 
+static noinline_for_stack
+char *address_val(char *buf, char *end, const void *addr,
+                 struct printf_spec spec, const char *fmt)
+{
+       unsigned long long num;
+
+       spec.flags |= SPECIAL | SMALL | ZEROPAD;
+       spec.base = 16;
+
+       switch (fmt[1]) {
+       case 'd':
+               num = *(const dma_addr_t *)addr;
+               spec.field_width = sizeof(dma_addr_t) * 2 + 2;
+               break;
+       case 'p':
+       default:
+               num = *(const phys_addr_t *)addr;
+               spec.field_width = sizeof(phys_addr_t) * 2 + 2;
+               break;
+       }
+
+       return number(buf, end, num, spec);
+}
+
 int kptr_restrict __read_mostly;
 
 /*
@@ -1218,7 +1246,8 @@ int kptr_restrict __read_mostly;
  *              N no separator
  *            The maximum supported length is 64 bytes of the input. Consider
  *            to use print_hex_dump() for the larger input.
- * - 'a' For a phys_addr_t type and its derivative types (passed by reference)
+ * - 'a[pd]' For address types [p] phys_addr_t, [d] dma_addr_t and derivatives
+ *           (default assumed to be phys_addr_t, passed by reference)
  * - 'd[234]' For a dentry name (optionally 2-4 last components)
  * - 'D[234]' Same as 'd' but for a struct file
  *
@@ -1353,11 +1382,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
                }
                break;
        case 'a':
-               spec.flags |= SPECIAL | SMALL | ZEROPAD;
-               spec.field_width = sizeof(phys_addr_t) * 2 + 2;
-               spec.base = 16;
-               return number(buf, end,
-                             (unsigned long long) *((phys_addr_t *)ptr), spec);
+               return address_val(buf, end, ptr, spec, fmt);
        case 'd':
                return dentry_name(buf, end, ptr, spec, fmt);
        case 'D':
@@ -1512,10 +1537,6 @@ qualifier:
                return fmt - start;
                /* skip alnum */
 
-       case 'n':
-               spec->type = FORMAT_TYPE_NRCHARS;
-               return ++fmt - start;
-
        case '%':
                spec->type = FORMAT_TYPE_PERCENT_CHAR;
                return ++fmt - start;
@@ -1538,6 +1559,15 @@ qualifier:
        case 'u':
                break;
 
+       case 'n':
+               /*
+                * Since %n poses a greater security risk than utility, treat
+                * it as an invalid format specifier. Warn about its use so
+                * that new instances don't get added.
+                */
+               WARN_ONCE(1, "Please remove ignored %%n in '%s'\n", fmt);
+               /* Fall-through */
+
        default:
                spec->type = FORMAT_TYPE_INVALID;
                return fmt - start;
@@ -1711,20 +1741,6 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
                        ++str;
                        break;
 
-               case FORMAT_TYPE_NRCHARS: {
-                       /*
-                        * Since %n poses a greater security risk than
-                        * utility, ignore %n and skip its argument.
-                        */
-                       void *skip_arg;
-
-                       WARN_ONCE(1, "Please remove ignored %%n in '%s'\n",
-                                       old_fmt);
-
-                       skip_arg = va_arg(args, void *);
-                       break;
-               }
-
                default:
                        switch (spec.type) {
                        case FORMAT_TYPE_LONG_LONG:
@@ -1999,19 +2015,6 @@ do {                                                                     \
                                fmt++;
                        break;
 
-               case FORMAT_TYPE_NRCHARS: {
-                       /* skip %n 's argument */
-                       u8 qualifier = spec.qualifier;
-                       void *skip_arg;
-                       if (qualifier == 'l')
-                               skip_arg = va_arg(args, long *);
-                       else if (_tolower(qualifier) == 'z')
-                               skip_arg = va_arg(args, size_t *);
-                       else
-                               skip_arg = va_arg(args, int *);
-                       break;
-               }
-
                default:
                        switch (spec.type) {
 
@@ -2170,10 +2173,6 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
                        ++str;
                        break;
 
-               case FORMAT_TYPE_NRCHARS:
-                       /* skip */
-                       break;
-
                default: {
                        unsigned long long num;