Commit 4ef584ba authored by Russell King's avatar Russell King Committed by Russell King

[ARM] fix nwflash.c: 6ee8928d

drivers/char/nwflash.c: In function 'flash_read':
drivers/char/nwflash.c:129: error: 'p' undeclared (first use in this function)
drivers/char/nwflash.c:129: error: (Each undeclared identifier is reported only once
drivers/char/nwflash.c:129: error: for each function it appears in.)
drivers/char/nwflash.c:129: error: 'count' undeclared (first use in this function)
drivers/char/nwflash.c:136: warning: passing argument 4 of 'simple_read_from_buffer' discards qualifiers from pointer target type
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent bb2b180c
...@@ -125,15 +125,15 @@ static ssize_t flash_read(struct file *file, char __user *buf, size_t size, ...@@ -125,15 +125,15 @@ static ssize_t flash_read(struct file *file, char __user *buf, size_t size,
ssize_t ret; ssize_t ret;
if (flashdebug) if (flashdebug)
printk(KERN_DEBUG "flash_read: flash_read: offset=0x%lX, " printk(KERN_DEBUG "flash_read: flash_read: offset=0x%llx, "
"buffer=%p, count=0x%X.\n", p, buf, count); "buffer=%p, count=0x%zx.\n", *ppos, buf, size);
/* /*
* We now lock against reads and writes. --rmk * We now lock against reads and writes. --rmk
*/ */
if (mutex_lock_interruptible(&nwflash_mutex)) if (mutex_lock_interruptible(&nwflash_mutex))
return -ERESTARTSYS; return -ERESTARTSYS;
ret = simple_read_from_buffer(buf, size, ppos, FLASH_BASE, gbFlashSize); ret = simple_read_from_buffer(buf, size, ppos, (void *)FLASH_BASE, gbFlashSize);
mutex_unlock(&nwflash_mutex); mutex_unlock(&nwflash_mutex);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment