2023-04-05 06:07:48

by Tudor Ambarus

Subject: [PATCH] mtd: spi-nor: spansion: Rename method to cypress_nor_get_page_size

The method queries SPINOR_REG_CYPRESS_CFR3V to determine the page size.
Rename the method accordingly, s/set/get.

Signed-off-by: Tudor Ambarus <[email protected]>
---
drivers/mtd/spi-nor/spansion.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/mtd/spi-nor/spansion.c b/drivers/mtd/spi-nor/spansion.c
index ffeede78700d..c937f0ac61de 100644
--- a/drivers/mtd/spi-nor/spansion.c
+++ b/drivers/mtd/spi-nor/spansion.c
@@ -302,8 +302,7 @@ static int cypress_nor_set_addr_mode_nbytes(struct spi_nor *nor)
}

/**
- * cypress_nor_set_page_size() - Set page size which corresponds to the flash
- * configuration.
+ * cypress_nor_get_page_size() - Get flash page size configuration.
* @nor: pointer to a 'struct spi_nor'
*
* The BFPT table advertises a 512B or 256B page size depending on part but the
@@ -312,7 +311,7 @@ static int cypress_nor_set_addr_mode_nbytes(struct spi_nor *nor)
*
* Return: 0 on success, -errno otherwise.
*/
-static int cypress_nor_set_page_size(struct spi_nor *nor)
+static int cypress_nor_get_page_size(struct spi_nor *nor)
{
struct spi_mem_op op =
CYPRESS_NOR_RD_ANY_REG_OP(nor->params->addr_mode_nbytes,
@@ -368,7 +367,7 @@ s25fs256t_post_bfpt_fixup(struct spi_nor *nor,
if (nor->bouncebuf[0])
return -ENODEV;

- return cypress_nor_set_page_size(nor);
+ return cypress_nor_get_page_size(nor);
}

static void s25fs256t_post_sfdp_fixup(struct spi_nor *nor)
@@ -407,7 +406,7 @@ s25hx_t_post_bfpt_fixup(struct spi_nor *nor,
/* Replace Quad Enable with volatile version */
nor->params->quad_enable = cypress_nor_quad_enable_volatile;

- return cypress_nor_set_page_size(nor);
+ return cypress_nor_get_page_size(nor);
}

static void s25hx_t_post_sfdp_fixup(struct spi_nor *nor)
@@ -502,7 +501,7 @@ static int s28hx_t_post_bfpt_fixup(struct spi_nor *nor,
if (ret)
return ret;

- return cypress_nor_set_page_size(nor);
+ return cypress_nor_get_page_size(nor);
}

static void s28hx_t_late_init(struct spi_nor *nor)
--
2.34.1

2023-04-18 09:39:52

by Michael Walle

Subject: Re: [PATCH] mtd: spi-nor: spansion: Rename method to cypress_nor_get_page_size

Am 2023-04-05 08:04, schrieb Tudor Ambarus:
> The method queries SPINOR_REG_CYPRESS_CFR3V to determine the page size.
> Rename the method accordingly, s/set/get.

I'm not sure about this one. There is also a
cypress_nor_set_addr_mode_nbytes() which queries the flash and
set the params->addr_nbytes and params->addr_mode_nbytes.

cypress_nor_set_page_size() also queries the flash and set
params->page_size.

Secondly, if this function is called get_page_size() I'd assume it
doesn't modify anything. But thats not true.

-michael

2023-04-18 10:27:03

by Tudor Ambarus

Subject: Re: [PATCH] mtd: spi-nor: spansion: Rename method to cypress_nor_get_page_size

On 4/18/23 10:29, Michael Walle wrote:
> Am 2023-04-05 08:04, schrieb Tudor Ambarus:
>> The method queries SPINOR_REG_CYPRESS_CFR3V to determine the page size.
>> Rename the method accordingly, s/set/get.
>
> I'm not sure about this one. There is also a
> cypress_nor_set_addr_mode_nbytes() which queries the flash and
> set the params->addr_nbytes and params->addr_mode_nbytes.
>
> cypress_nor_set_page_size() also queries the flash and set
> params->page_size.
>
> Secondly, if this function is called get_page_size() I'd assume it
> doesn't modify anything. But thats not true.
>

Indeed. Maybe I should have returned the page_size instead or don't
change the name at all. I applied this patch as part of
https://lore.kernel.org/linux-mtd/[email protected]/

Feel free to send a patch on top of latest spi-nor branch, otherwise
I'll handle it after the merge window.

Cheers,
ta.