2018-01-13 16:56:46

by Christophe JAILLET

Subject: [PATCH] mtd: onenand: samsung: remove incorrect __iomem annotation

'page_buf' and 'oob_buf' are allocated with 'devm_kzalloc()' and should not
have __iommem decoration.

Remove these decorations and some useless casting.

Signed-off-by: Christophe JAILLET <[email protected]>
---
drivers/mtd/onenand/samsung.c | 12 ++++++------
1 file 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 {
void __iomem *base;
void __iomem *ahb_addr;
int bootram_command;
- void __iomem *page_buf;
- void __iomem *oob_buf;
+ void *page_buf;
+ void *oob_buf;
unsigned int (*mem_addr)(int fba, int fpa, int fsa);
unsigned int (*cmd_map)(unsigned int type, unsigned int val);
void __iomem *dma_addr;
@@ -408,8 +408,8 @@ static int s3c_onenand_command(struct mtd_info *mtd, int cmd, loff_t addr,
/*
* Emulate Two BufferRAMs and access with 4 bytes pointer
*/
- m = (unsigned int *) onenand->page_buf;
- s = (unsigned int *) onenand->oob_buf;
+ m = onenand->page_buf;
+ s = onenand->oob_buf;

if (index) {
m += (this->writesize >> 2);
@@ -481,11 +481,11 @@ static unsigned char *s3c_get_bufferram(struct mtd_info *mtd, int area)
unsigned char *p;

if (area == ONENAND_DATARAM) {
- p = (unsigned char *) onenand->page_buf;
+ p = onenand->page_buf;
if (index == 1)
p += this->writesize;
} else {
- p = (unsigned char *) onenand->oob_buf;
+ p = onenand->oob_buf;
if (index == 1)
p += mtd->oobsize;
}
--
2.14.1

2018-01-14 14:04:50

by Boris Brezillon

Subject: Re: [PATCH] mtd: onenand: samsung: remove incorrect __iomem annotation

On Sat, 13 Jan 2018 17:56:16 +0100
Christophe JAILLET <[email protected]> wrote:

> 'page_buf' and 'oob_buf' are allocated with 'devm_kzalloc()' and should not
> have __iommem decoration.

^ __iomem

No need to send a new version, I'll fix it when applying.

>
> Remove these decorations and some useless casting.
>
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> drivers/mtd/onenand/samsung.c | 12 ++++++------
> 1 file 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 {
> void __iomem *base;
> void __iomem *ahb_addr;
> int bootram_command;
> - void __iomem *page_buf;
> - void __iomem *oob_buf;
> + void *page_buf;
> + void *oob_buf;
> unsigned int (*mem_addr)(int fba, int fpa, int fsa);
> unsigned int (*cmd_map)(unsigned int type, unsigned int val);
> void __iomem *dma_addr;
> @@ -408,8 +408,8 @@ static int s3c_onenand_command(struct mtd_info *mtd, int cmd, loff_t addr,
> /*
> * Emulate Two BufferRAMs and access with 4 bytes pointer
> */
> - m = (unsigned int *) onenand->page_buf;
> - s = (unsigned int *) onenand->oob_buf;
> + m = onenand->page_buf;
> + s = onenand->oob_buf;
>
> if (index) {
> m += (this->writesize >> 2);
> @@ -481,11 +481,11 @@ static unsigned char *s3c_get_bufferram(struct mtd_info *mtd, int area)
> unsigned char *p;
>
> if (area == ONENAND_DATARAM) {
> - p = (unsigned char *) onenand->page_buf;
> + p = onenand->page_buf;
> if (index == 1)
> p += this->writesize;
> } else {
> - p = (unsigned char *) onenand->oob_buf;
> + p = onenand->oob_buf;
> if (index == 1)
> p += mtd->oobsize;
> }

2018-01-15 10:02:56

by Boris Brezillon

Subject: Re: [PATCH] mtd: onenand: samsung: remove incorrect __iomem annotation

On Sat, 13 Jan 2018 17:56:16 +0100
Christophe JAILLET <[email protected]> wrote:

> 'page_buf' and 'oob_buf' are allocated with 'devm_kzalloc()' and should not
> have __iommem decoration.
>
> Remove these decorations and some useless casting.
>

Applied.

Thanks,

Boris

> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> drivers/mtd/onenand/samsung.c | 12 ++++++------
> 1 file 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 {
> void __iomem *base;
> void __iomem *ahb_addr;
> int bootram_command;
> - void __iomem *page_buf;
> - void __iomem *oob_buf;
> + void *page_buf;
> + void *oob_buf;
> unsigned int (*mem_addr)(int fba, int fpa, int fsa);
> unsigned int (*cmd_map)(unsigned int type, unsigned int val);
> void __iomem *dma_addr;
> @@ -408,8 +408,8 @@ static int s3c_onenand_command(struct mtd_info *mtd, int cmd, loff_t addr,
> /*
> * Emulate Two BufferRAMs and access with 4 bytes pointer
> */
> - m = (unsigned int *) onenand->page_buf;
> - s = (unsigned int *) onenand->oob_buf;
> + m = onenand->page_buf;
> + s = onenand->oob_buf;
>
> if (index) {
> m += (this->writesize >> 2);
> @@ -481,11 +481,11 @@ static unsigned char *s3c_get_bufferram(struct mtd_info *mtd, int area)
> unsigned char *p;
>
> if (area == ONENAND_DATARAM) {
> - p = (unsigned char *) onenand->page_buf;
> + p = onenand->page_buf;
> if (index == 1)
> p += this->writesize;
> } else {
> - p = (unsigned char *) onenand->oob_buf;
> + p = onenand->oob_buf;
> if (index == 1)
> p += mtd->oobsize;
> }