diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-26 10:46:39 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-26 11:29:24 -0400 |
commit | 4ef584ba84125b67c17b5aded38e7783cd8cdef0 (patch) | |
tree | f54f094810950b96a0ad4d9eb24583f9b2d76493 /drivers/char/nwflash.c | |
parent | bb2b180ca0469a51256d5ad62008b495345ad61f (diff) |
[ARM] fix nwflash.c: 6ee8928d94841aa764aeaf645ad16daff811dc26
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: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/char/nwflash.c')
-rw-r--r-- | drivers/char/nwflash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/nwflash.c b/drivers/char/nwflash.c index f9f72a211292..006be92ee3f3 100644 --- a/drivers/char/nwflash.c +++ b/drivers/char/nwflash.c | |||
@@ -125,15 +125,15 @@ static ssize_t flash_read(struct file *file, char __user *buf, size_t size, | |||
125 | ssize_t ret; | 125 | ssize_t ret; |
126 | 126 | ||
127 | if (flashdebug) | 127 | if (flashdebug) |
128 | printk(KERN_DEBUG "flash_read: flash_read: offset=0x%lX, " | 128 | printk(KERN_DEBUG "flash_read: flash_read: offset=0x%llx, " |
129 | "buffer=%p, count=0x%X.\n", p, buf, count); | 129 | "buffer=%p, count=0x%zx.\n", *ppos, buf, size); |
130 | /* | 130 | /* |
131 | * We now lock against reads and writes. --rmk | 131 | * We now lock against reads and writes. --rmk |
132 | */ | 132 | */ |
133 | if (mutex_lock_interruptible(&nwflash_mutex)) | 133 | if (mutex_lock_interruptible(&nwflash_mutex)) |
134 | return -ERESTARTSYS; | 134 | return -ERESTARTSYS; |
135 | 135 | ||
136 | ret = simple_read_from_buffer(buf, size, ppos, FLASH_BASE, gbFlashSize); | 136 | ret = simple_read_from_buffer(buf, size, ppos, (void *)FLASH_BASE, gbFlashSize); |
137 | mutex_unlock(&nwflash_mutex); | 137 | mutex_unlock(&nwflash_mutex); |
138 | 138 | ||
139 | return ret; | 139 | return ret; |