diff mbox

[1/6] MTD: lantiq: xway: fix invalid operator

Message ID 1451941501-42952-2-git-send-email-blogic@openwrt.org
State Changes Requested
Headers show

Commit Message

John Crispin Jan. 4, 2016, 9:04 p.m. UTC
xway_read_byte should use a logic or and not an add operator when working
out the nand address.

Signed-off-by: John Crispin <blogic@openwrt.org>
---
 drivers/mtd/nand/xway_nand.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Brian Norris Jan. 4, 2016, 11:33 p.m. UTC | #1
On Mon, Jan 04, 2016 at 10:04:56PM +0100, John Crispin wrote:
> xway_read_byte should use a logic or and not an add operator when working
> out the nand address.

Why? It looks like a typical base address + offset use case. Or am I
missing something?

It would help if there was some kind of documentation, like the missing
DT doc that I mentioned on the cover letter, so I can know what the IO
mem range is supposed to be.

> Signed-off-by: John Crispin <blogic@openwrt.org>
> ---
>  drivers/mtd/nand/xway_nand.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c
> index 3b28db4..81ec685 100644
> --- a/drivers/mtd/nand/xway_nand.c
> +++ b/drivers/mtd/nand/xway_nand.c
> @@ -124,7 +124,7 @@ static unsigned char xway_read_byte(struct mtd_info *mtd)
>  	int ret;
>  
>  	spin_lock_irqsave(&ebu_lock, flags);
> -	ret = ltq_r8((void __iomem *)(nandaddr + NAND_READ_DATA));
> +	ret = ltq_r8((void __iomem *)(nandaddr | NAND_READ_DATA));

This looks like odd code anyway; why all the casting? We have:

  void __iomem * --> unsigned long --> void __iomem *

Brian

>  	spin_unlock_irqrestore(&ebu_lock, flags);
>  
>  	return ret;
> -- 
> 1.7.10.4
> 
> ______________________________________________________
> Linux MTD discussion mailing list
> http://lists.infradead.org/mailman/listinfo/linux-mtd/
diff mbox

Patch

diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c
index 3b28db4..81ec685 100644
--- a/drivers/mtd/nand/xway_nand.c
+++ b/drivers/mtd/nand/xway_nand.c
@@ -124,7 +124,7 @@  static unsigned char xway_read_byte(struct mtd_info *mtd)
 	int ret;
 
 	spin_lock_irqsave(&ebu_lock, flags);
-	ret = ltq_r8((void __iomem *)(nandaddr + NAND_READ_DATA));
+	ret = ltq_r8((void __iomem *)(nandaddr | NAND_READ_DATA));
 	spin_unlock_irqrestore(&ebu_lock, flags);
 
 	return ret;