[PATCH] mtd: spi-nor: Fix S3AN addressing calculation

[Marek Vasut]

On 01/18/2017 05:08 PM, Ricardo Ribalda Delgado wrote:
> The page calculation under spi_nor_s3an_addr_convert() was wrong. On
> Default Address Mode we need to perform a divide by page_size.
> 
> Fixes: 61cba34bd6c1 ("mtd: spi-nor: Add support for S3AN spi-nor devices")
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda at gmail.com>
> ---
>  drivers/mtd/spi-nor/spi-nor.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
> index 2a643a1bb45e..a374532068f0 100644
> --- a/drivers/mtd/spi-nor/spi-nor.c
> +++ b/drivers/mtd/spi-nor/spi-nor.c
> @@ -431,11 +431,15 @@ static void spi_nor_unlock_and_unprep(struct spi_nor *nor, enum spi_nor_ops ops)
>   */
>  static loff_t spi_nor_s3an_addr_convert(struct spi_nor *nor, unsigned int addr)
>  {
> -	unsigned int offset = addr;
> +	unsigned int offset;
> +	unsigned int ret;

Can you use something less opaque than "ret" , something more
descriptive ? Thanks

> -	offset %= nor->page_size;
> +	offset = addr % nor->page_size;
> +	ret = addr / nor->page_size;
> +	ret <<= (nor->page_size > 512) ? 10 : 9;
> +	ret |= offset;
>  
> -	return ((addr - offset) << 1) | offset;
> +	return ret;
>  }
>  
>  /*
> 


-- 
Best regards,
Marek Vasut