openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 a69755b187 ("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>
This commit is contained in:
Geert Uytterhoeven 2013-05-09 14:08:31 +02:00 committed by Al Viro
parent 9affd6becb
commit 0757f6159f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/xtensa/platforms/iss/simdisk.c
View File

@ -217,7 +217,7 @@ static ssize_t proc_read_simdisk(struct file *file, char __user *buf,
size_t size, loff_t *ppos) size_t size, loff_t *ppos)
{ {
struct simdisk *dev = PDE_DATA(file_inode(file)); struct simdisk *dev = PDE_DATA(file_inode(file));
char *s = dev->filename; const char *s = dev->filename;
if (s) { if (s) {
ssize_t n = simple_read_from_buffer(buf, size, ppos, ssize_t n = simple_read_from_buffer(buf, size, ppos,
s, strlen(s)); s, strlen(s));
@ -238,7 +238,7 @@ static ssize_t proc_write_simdisk(struct file *file, const char __user *buf,
if (tmp == NULL) if (tmp == NULL)
return -ENOMEM; return -ENOMEM;
if (copy_from_user(tmp, buffer, count)) { if (copy_from_user(tmp, buf, count)) {
err = -EFAULT; err = -EFAULT;
goto out_free; goto out_free;
} }