ARM: at91/dt: Fix sama5d3x typos

[cascardo/linux.git] / lib / cmdline.c

diff --git a/lib/cmdline.c b/lib/cmdline.c
index d4932f7..8f13cf7 100644 (file)
--- a/lib/cmdline.c
+++ b/lib/cmdline.c
@@ -121,11 +121,7 @@ EXPORT_SYMBOL(get_options);
  *     @retptr: (output) Optional pointer to next char after parse completes
  *
  *     Parses a string into a number.  The number stored at @ptr is
- *     potentially suffixed with %K (for kilobytes, or 1024 bytes),
- *     %M (for megabytes, or 1048576 bytes), or %G (for gigabytes, or
- *     1073741824).  If the number is suffixed with K, M, or G, then
- *     the return value is the number multiplied by one kilobyte, one
- *     megabyte, or one gigabyte, respectively.
+ *     potentially suffixed with K, M, G, T, P, E.
  */
 
 unsigned long long memparse(const char *ptr, char **retptr)
@@ -135,6 +131,15 @@ unsigned long long memparse(const char *ptr, char **retptr)
        unsigned long long ret = simple_strtoull(ptr, &endptr, 0);
 
        switch (*endptr) {
+       case 'E':
+       case 'e':
+               ret <<= 10;
+       case 'P':
+       case 'p':
+               ret <<= 10;
+       case 'T':
+       case 't':
+               ret <<= 10;
        case 'G':
        case 'g':
                ret <<= 10;
@@ -155,3 +160,32 @@ unsigned long long memparse(const char *ptr, char **retptr)
        return ret;
 }
 EXPORT_SYMBOL(memparse);
+
+/**
+ *     parse_option_str - Parse a string and check an option is set or not
+ *     @str: String to be parsed
+ *     @option: option name
+ *
+ *     This function parses a string containing a comma-separated list of
+ *     strings like a=b,c.
+ *
+ *     Return true if there's such option in the string, or return false.
+ */
+bool parse_option_str(const char *str, const char *option)
+{
+       while (*str) {
+               if (!strncmp(str, option, strlen(option))) {
+                       str += strlen(option);
+                       if (!*str || *str == ',')
+                               return true;
+               }
+
+               while (*str && *str != ',')
+                       str++;
+
+               if (*str == ',')
+                       str++;
+       }
+
+       return false;
+}