libstring_helpers.c:string_get_size(): return void

string_get_size() was documented to return an error, but in fact always
returned 0.  Since the output always fits in 9 bytes, just document that
and let callers do what they do now: pass a small stack buffer and ignore
the return value.

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/string_helpers.h b/include/linux/string_helpers.h
index 6eb567ac56bc10394eb69793ad30b000545afe17..657571817260ab9b22b76606f81492074f240d49 100644 (file)
--- a/include/linux/string_helpers.h
+++ b/include/linux/string_helpers.h
@@ -10,8 +10,8 @@ enum string_size_units {
        STRING_UNITS_2,         /* use binary powers of 2^10 */
 };
 
-int string_get_size(u64 size, enum string_size_units units,
-                   char *buf, int len);
+void string_get_size(u64 size, enum string_size_units units,
+                    char *buf, int len);
 
 #define UNESCAPE_SPACE         0x01
 #define UNESCAPE_OCTAL         0x02

diff --git a/lib/string_helpers.c b/lib/string_helpers.c
index 2b3757f84b3b6cc1742fc3c1027db805f2073388..8f8c4417f22865d9ffb274700540b37f1a17bd93 100644 (file)
--- a/lib/string_helpers.c
+++ b/lib/string_helpers.c
@@ -20,12 +20,12 @@
  * @len:       length of buffer
  *
  * This function returns a string formatted to 3 significant figures
- * giving the size in the required units.  Returns 0 on success or
- * error on failure.  @buf is always zero terminated.
+ * giving the size in the required units.  @buf should have room for
+ * at least 9 bytes and will always be zero terminated.
  *
  */
-int string_get_size(u64 size, const enum string_size_units units,
-                   char *buf, int len)
+void string_get_size(u64 size, const enum string_size_units units,
+                    char *buf, int len)
 {
        static const char *const units_10[] = {
                "B", "kB", "MB", "GB", "TB", "PB", "EB"
@@ -67,8 +67,6 @@ int string_get_size(u64 size, const enum string_size_units units,
 
        snprintf(buf, len, "%u%s %s", (u32)size,
                 tmp, units_str[units][i]);
-
-       return 0;
 }
 EXPORT_SYMBOL(string_get_size);