Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0757f615 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Al Viro
Browse files

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 a69755b1 ("xtensa
simdisk: switch to proc_create_data()")

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 9affd6be

arch/xtensa/platforms/iss/simdisk.c

+2 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static ssize_t proc_read_simdisk(struct file *file, char __user *buf, 
			size_t size, loff_t *ppos)

{

	struct simdisk *dev = PDE_DATA(file_inode(file));

	char *s = dev->filename;

	const char *s = dev->filename;

	if (s) {

		ssize_t n = simple_read_from_buffer(buf, size, ppos,

							s, strlen(s));
@@ -238,7 +238,7 @@ static ssize_t proc_write_simdisk(struct file *file, const char __user *buf, 


	if (tmp == NULL)

		return -ENOMEM;

	if (copy_from_user(tmp, buffer, count)) {

	if (copy_from_user(tmp, buf, count)) {

		err = -EFAULT;

		goto out_free;

	}