diff options
author | Masami Hiramatsu <mhiramat@kernel.org> | 2017-05-17 13:14:57 -0400 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2017-07-05 17:16:44 -0400 |
commit | e03c78ac2d7709b7556a9b8dd584e2969c6fce67 (patch) | |
tree | 8904cec3431d52001b10028c7f865f0db1b4ee6a | |
parent | 32c1431eea4881a6b17bd7c639315010aeefa452 (diff) |
um: Use printk instead of printf in make_uml_dir
Since this function will be called after printk buffer
initialized, use printk as other functions do.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Richard Weinberger <richard@nod.at>
-rw-r--r-- | arch/um/os-Linux/umid.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/um/os-Linux/umid.c b/arch/um/os-Linux/umid.c index c1dc89261f67..37cfaba47aa6 100644 --- a/arch/um/os-Linux/umid.c +++ b/arch/um/os-Linux/umid.c | |||
@@ -35,8 +35,9 @@ static int __init make_uml_dir(void) | |||
35 | 35 | ||
36 | err = -ENOENT; | 36 | err = -ENOENT; |
37 | if (home == NULL) { | 37 | if (home == NULL) { |
38 | printk(UM_KERN_ERR "make_uml_dir : no value in " | 38 | printk(UM_KERN_ERR |
39 | "environment for $HOME\n"); | 39 | "%s: no value in environment for $HOME\n", |
40 | __func__); | ||
40 | goto err; | 41 | goto err; |
41 | } | 42 | } |
42 | strlcpy(dir, home, sizeof(dir)); | 43 | strlcpy(dir, home, sizeof(dir)); |
@@ -50,13 +51,15 @@ static int __init make_uml_dir(void) | |||
50 | err = -ENOMEM; | 51 | err = -ENOMEM; |
51 | uml_dir = malloc(strlen(dir) + 1); | 52 | uml_dir = malloc(strlen(dir) + 1); |
52 | if (uml_dir == NULL) { | 53 | if (uml_dir == NULL) { |
53 | printf("make_uml_dir : malloc failed, errno = %d\n", errno); | 54 | printk(UM_KERN_ERR "%s : malloc failed, errno = %d\n", |
55 | __func__, errno); | ||
54 | goto err; | 56 | goto err; |
55 | } | 57 | } |
56 | strcpy(uml_dir, dir); | 58 | strcpy(uml_dir, dir); |
57 | 59 | ||
58 | if ((mkdir(uml_dir, 0777) < 0) && (errno != EEXIST)) { | 60 | if ((mkdir(uml_dir, 0777) < 0) && (errno != EEXIST)) { |
59 | printf("Failed to mkdir '%s': %s\n", uml_dir, strerror(errno)); | 61 | printk(UM_KERN_ERR "Failed to mkdir '%s': %s\n", |
62 | uml_dir, strerror(errno)); | ||
60 | err = -errno; | 63 | err = -errno; |
61 | goto err_free; | 64 | goto err_free; |
62 | } | 65 | } |