[PATCH v3 5/9] mtd: spi-nor: manufacturers: Use spi_nor_read_id() core method

[Michael Walle]

Am 2022-04-11 11:10, schrieb Tudor Ambarus:
> Use spi_nor_read_id() core method to avoid duplication of code. Now the 
> ID
> is read on the full SPI_NOR_MAX_ID_LEN instead of
> round_up(nor->info->id_len, 2), but it doesn't harm to read more ID 
> bytes,
> so the change comes with no secondary effects. dev_dbg messages in case
> spi_nor_read_id() fails, will be added in a further patch after we 
> split
> the octal DTR enable/disable methods.
> 
> Signed-off-by: Tudor Ambarus <tudor.ambarus at microchip.com>
> Reviewed-by: Pratyush Yadav <p.yadav at ti.com>

I like it, but maybe add a

/* SPI_NOR_MAX_ID_LEN is also used for octal readid and needs to be even 
*/
static_assert(SPI_NOR_MAX_ID_LEN % 2 == 0);

Reviewed-by: Michael Walle <michael at walle.cc>

> ---
> v3: collect R-b, update commit message
> 
>  drivers/mtd/spi-nor/micron-st.c | 13 +++----------
>  drivers/mtd/spi-nor/spansion.c  | 13 +++----------
>  2 files changed, 6 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/mtd/spi-nor/micron-st.c 
> b/drivers/mtd/spi-nor/micron-st.c
> index 8a20475ce77a..41b87868ecf9 100644
> --- a/drivers/mtd/spi-nor/micron-st.c
> +++ b/drivers/mtd/spi-nor/micron-st.c
> @@ -91,17 +91,10 @@ static int micron_st_nor_octal_dtr_enable(struct
> spi_nor *nor, bool enable)
>  		return ret;
> 
>  	/* Read flash ID to make sure the switch was successful. */
> -	op = (struct spi_mem_op)
> -		SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_RDID, 1),
> -			   SPI_MEM_OP_NO_ADDR,
> -			   SPI_MEM_OP_DUMMY(enable ? 8 : 0, 1),
> -			   SPI_MEM_OP_DATA_IN(round_up(nor->info->id_len, 2),
> -					      buf, 1));
> -
>  	if (enable)
> -		spi_nor_spimem_setup_op(nor, &op, SNOR_PROTO_8_8_8_DTR);
> -
> -	ret = spi_mem_exec_op(nor->spimem, &op);
> +		ret = spi_nor_read_id(nor, 0, 8, buf, SNOR_PROTO_8_8_8_DTR);
> +	else
> +		ret = spi_nor_read_id(nor, 0, 0, buf, SNOR_PROTO_1_1_1);
>  	if (ret)
>  		return ret;
> 
> diff --git a/drivers/mtd/spi-nor/spansion.c 
> b/drivers/mtd/spi-nor/spansion.c
> index f24e546e04a5..c5988312cc91 100644
> --- a/drivers/mtd/spi-nor/spansion.c
> +++ b/drivers/mtd/spi-nor/spansion.c
> @@ -98,17 +98,10 @@ static int cypress_nor_octal_dtr_enable(struct
> spi_nor *nor, bool enable)
>  		return ret;
> 
>  	/* Read flash ID to make sure the switch was successful. */
> -	op = (struct spi_mem_op)
> -		SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_RDID, 1),
> -			   SPI_MEM_OP_ADDR(enable ? 4 : 0, 0, 1),
> -			   SPI_MEM_OP_DUMMY(enable ? 3 : 0, 1),
> -			   SPI_MEM_OP_DATA_IN(round_up(nor->info->id_len, 2),
> -					      buf, 1));
> -
>  	if (enable)
> -		spi_nor_spimem_setup_op(nor, &op, SNOR_PROTO_8_8_8_DTR);
> -
> -	ret = spi_mem_exec_op(nor->spimem, &op);
> +		ret = spi_nor_read_id(nor, 4, 3, buf, SNOR_PROTO_8_8_8_DTR);
> +	else
> +		ret = spi_nor_read_id(nor, 0, 0, buf, SNOR_PROTO_1_1_1);
>  	if (ret)
>  		return ret;