diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-05-09 08:08:31 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-05-09 13:20:20 -0400 |
commit | 0757f6159f13dcd9fe499befd4be57c5ee8afde8 (patch) | |
tree | d0cd47261f73cfd8cd9e395b9a556839d758bebc | |
parent | 9affd6becbfb2c3f0d04e554bb87234761b37aba (diff) |
xtensa simdisk: Fix proc_create_data() conversion fallout
arch/xtensa/platforms/iss/simdisk.c: In function 'proc_read_simdisk':
arch/xtensa/platforms/iss/simdisk.c:220:12: warning: initialization discards 'const' qualifier from pointer target type [enabled by default]
arch/xtensa/platforms/iss/simdisk.c: In function 'proc_write_simdisk':
arch/xtensa/platforms/iss/simdisk.c:241:38: error: 'buffer' undeclared (first use in this function)
arch/xtensa/platforms/iss/simdisk.c:241:38: note: each undeclared identifier is reported only once for each function it appears in
Introduced by commit a69755b187749e7cc020e17127a54f395aea4eaa ("xtensa
simdisk: switch to proc_create_data()")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | arch/xtensa/platforms/iss/simdisk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/xtensa/platforms/iss/simdisk.c b/arch/xtensa/platforms/iss/simdisk.c index 0345f43d34f3..fc3c91fd20f7 100644 --- a/arch/xtensa/platforms/iss/simdisk.c +++ b/arch/xtensa/platforms/iss/simdisk.c | |||
@@ -217,7 +217,7 @@ static ssize_t proc_read_simdisk(struct file *file, char __user *buf, | |||
217 | size_t size, loff_t *ppos) | 217 | size_t size, loff_t *ppos) |
218 | { | 218 | { |
219 | struct simdisk *dev = PDE_DATA(file_inode(file)); | 219 | struct simdisk *dev = PDE_DATA(file_inode(file)); |
220 | char *s = dev->filename; | 220 | const char *s = dev->filename; |
221 | if (s) { | 221 | if (s) { |
222 | ssize_t n = simple_read_from_buffer(buf, size, ppos, | 222 | ssize_t n = simple_read_from_buffer(buf, size, ppos, |
223 | s, strlen(s)); | 223 | s, strlen(s)); |
@@ -238,7 +238,7 @@ static ssize_t proc_write_simdisk(struct file *file, const char __user *buf, | |||
238 | 238 | ||
239 | if (tmp == NULL) | 239 | if (tmp == NULL) |
240 | return -ENOMEM; | 240 | return -ENOMEM; |
241 | if (copy_from_user(tmp, buffer, count)) { | 241 | if (copy_from_user(tmp, buf, count)) { |
242 | err = -EFAULT; | 242 | err = -EFAULT; |
243 | goto out_free; | 243 | goto out_free; |
244 | } | 244 | } |