Merge tag 'efi-urgent' into x86/urgent

[~andy/linux] / lib / cmdline.c

diff --git a/lib/cmdline.c b/lib/cmdline.c
index eb6791188cf51a19b22861ea23909f93be08935d..d4932f745e9214aaf62d8ad54b0f1092dd555414 100644 (file)
--- a/lib/cmdline.c
+++ b/lib/cmdline.c
@@ -49,13 +49,13 @@ static int get_range(char **str, int *pint)
  *     3 - hyphen found to denote a range
  */
 
-int get_option (char **str, int *pint)
+int get_option(char **str, int *pint)
 {
        char *cur = *str;
 
        if (!cur || !(*cur))
                return 0;
-       *pint = simple_strtol (cur, str, 0);
+       *pint = simple_strtol(cur, str, 0);
        if (cur == *str)
                return 0;
        if (**str == ',') {
@@ -67,6 +67,7 @@ int get_option (char **str, int *pint)
 
        return 1;
 }
+EXPORT_SYMBOL(get_option);
 
 /**
  *     get_options - Parse a string into a list of integers
@@ -84,13 +85,13 @@ int get_option (char **str, int *pint)
  *     the parse to end (typically a null terminator, if @str is
  *     completely parseable).
  */
- 
+
 char *get_options(const char *str, int nints, int *ints)
 {
        int res, i = 1;
 
        while (i < nints) {
-               res = get_option ((char **)&str, ints + i);
+               res = get_option((char **)&str, ints + i);
                if (res == 0)
                        break;
                if (res == 3) {
@@ -112,6 +113,7 @@ char *get_options(const char *str, int nints, int *ints)
        ints[0] = i - 1;
        return (char *)str;
 }
+EXPORT_SYMBOL(get_options);
 
 /**
  *     memparse - parse a string with mem suffixes into a number
@@ -152,8 +154,4 @@ unsigned long long memparse(const char *ptr, char **retptr)
 
        return ret;
 }
-
-
 EXPORT_SYMBOL(memparse);
-EXPORT_SYMBOL(get_option);
-EXPORT_SYMBOL(get_options);