mfd: arizona: Mark additional registers as volatile

[firefly-linux-kernel-4.4.55.git] / drivers / mtd / devices / phram.c

diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
index 2cceebfb251e7b6959758b8c7a6bc19b4c9a6c1e..effd9a4ef7eee55ff6cd8e58f4c35930e86957d0 100644 (file)
--- a/drivers/mtd/devices/phram.c
+++ b/drivers/mtd/devices/phram.c
@@ -181,12 +181,10 @@ static int parse_name(char **pname, const char *token)
        if (len > 64)
                return -ENOSPC;
 
-       name = kmalloc(len, GFP_KERNEL);
+       name = kstrdup(token, GFP_KERNEL);
        if (!name)
                return -ENOMEM;
 
-       strcpy(name, token);
-
        *pname = name;
        return 0;
 }
@@ -195,6 +193,7 @@ static int parse_name(char **pname, const char *token)
 static inline void kill_final_newline(char *str)
 {
        char *newline = strrchr(str, '\n');
+
        if (newline && !newline[1])
                *newline = 0;
 }
@@ -233,7 +232,7 @@ static int phram_setup(const char *val)
        strcpy(str, val);
        kill_final_newline(str);
 
-       for (i=0; i<3; i++)
+       for (i = 0; i < 3; i++)
                token[i] = strsep(&str, ",");
 
        if (str)