summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2018-01-13 11:56:16 -0500
committerBoris Brezillon <boris.brezillon@free-electrons.com>2018-01-14 09:04:56 -0500
commit6837befde3a6b42a36c894a4f86bafdc6db82534 (patch)
tree38f4212375805a1f815ee3e0d3725c73b3a4155e
parentb4525db6f0c6dc02ad2bde08a3bcdcf0ad7891d4 (diff)
mtd: onenand: samsung: remove incorrect __iomem annotation
'page_buf' and 'oob_buf' are allocated with 'devm_kzalloc()' and should not have __iomem decoration. Remove these decorations and some useless casting. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
-rw-r--r--drivers/mtd/onenand/samsung.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c
index dfdfb478ba35..2e9d076e445a 100644
--- a/drivers/mtd/onenand/samsung.c
+++ b/drivers/mtd/onenand/samsung.c
@@ -129,8 +129,8 @@ struct s3c_onenand {
129 void __iomem *base; 129 void __iomem *base;
130 void __iomem *ahb_addr; 130 void __iomem *ahb_addr;
131 int bootram_command; 131 int bootram_command;
132 void __iomem *page_buf; 132 void *page_buf;
133 void __iomem *oob_buf; 133 void *oob_buf;
134 unsigned int (*mem_addr)(int fba, int fpa, int fsa); 134 unsigned int (*mem_addr)(int fba, int fpa, int fsa);
135 unsigned int (*cmd_map)(unsigned int type, unsigned int val); 135 unsigned int (*cmd_map)(unsigned int type, unsigned int val);
136 void __iomem *dma_addr; 136 void __iomem *dma_addr;
@@ -408,8 +408,8 @@ static int s3c_onenand_command(struct mtd_info *mtd, int cmd, loff_t addr,
408 /* 408 /*
409 * Emulate Two BufferRAMs and access with 4 bytes pointer 409 * Emulate Two BufferRAMs and access with 4 bytes pointer
410 */ 410 */
411 m = (unsigned int *) onenand->page_buf; 411 m = onenand->page_buf;
412 s = (unsigned int *) onenand->oob_buf; 412 s = onenand->oob_buf;
413 413
414 if (index) { 414 if (index) {
415 m += (this->writesize >> 2); 415 m += (this->writesize >> 2);
@@ -481,11 +481,11 @@ static unsigned char *s3c_get_bufferram(struct mtd_info *mtd, int area)
481 unsigned char *p; 481 unsigned char *p;
482 482
483 if (area == ONENAND_DATARAM) { 483 if (area == ONENAND_DATARAM) {
484 p = (unsigned char *) onenand->page_buf; 484 p = onenand->page_buf;
485 if (index == 1) 485 if (index == 1)
486 p += this->writesize; 486 p += this->writesize;
487 } else { 487 } else {
488 p = (unsigned char *) onenand->oob_buf; 488 p = onenand->oob_buf;
489 if (index == 1) 489 if (index == 1)
490 p += mtd->oobsize; 490 p += mtd->oobsize;
491 } 491 }