Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4ef584ba84125b67c17b5aded38e7783cd8cdef0

Authored by Russell King
Committed by Russell King
1 parent bb2b180ca0
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

drivers/char/nwflash.c
Diff comments   View file @ 4ef584b
... ... @@ -125,15 +125,15 @@
125 125 ssize_t ret;
126 126  
127 127 if (flashdebug)
128   - printk(KERN_DEBUG "flash_read: flash_read: offset=0x%lX, "
129   - "buffer=%p, count=0x%X.\n", p, buf, count);
  128 + printk(KERN_DEBUG "flash_read: flash_read: offset=0x%llx, "
  129 + "buffer=%p, count=0x%zx.\n", *ppos, buf, size);
130 130 /*
131 131 * We now lock against reads and writes. --rmk
132 132 */
133 133 if (mutex_lock_interruptible(&nwflash_mutex))
134 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 137 mutex_unlock(&nwflash_mutex);
138 138  
139 139 return ret;