On 04/02/21 07:45PM, Tudor Ambarus wrote:
> spi_nor_parse_sfdp(nor, nor->params);
> passes for the second argument a member within the first argument.
> Drop the second argument and obtain it directly from the first,
> and do it across all the children functions. This is a follow up for
> 'commit 69a8eed58cc0 ("mtd: spi-nor: Don't copy self-pointing struct around")'
>
> Signed-off-by: Tudor Ambarus <tudor.amba...@microchip.com>
> ---
> drivers/mtd/spi-nor/core.c | 10 ++--
> drivers/mtd/spi-nor/core.h | 6 +--
> drivers/mtd/spi-nor/issi.c | 3 +-
> drivers/mtd/spi-nor/macronix.c | 3 +-
> drivers/mtd/spi-nor/sfdp.c | 87 +++++++++++++---------------------
> drivers/mtd/spi-nor/sfdp.h | 3 +-
> drivers/mtd/spi-nor/spansion.c | 12 ++---
> drivers/mtd/spi-nor/winbond.c | 3 +-
> 8 files changed, 49 insertions(+), 78 deletions(-)
>
[...]
> @@ -945,13 +935,11 @@ static int spi_nor_parse_smpt(struct spi_nor *nor,
> * @nor: pointer to a 'struct spi_nor'.
> * @param_header: pointer to the 'struct sfdp_parameter_header' describing
> * the 4-Byte Address Instruction Table length and version.
> - * @params: pointer to the 'struct spi_nor_flash_parameter' to be.
> *
> * Return: 0 on success, -errno otherwise.
> */
> static int spi_nor_parse_4bait(struct spi_nor *nor,
> - const struct sfdp_parameter_header *param_header,
> - struct spi_nor_flash_parameter *params)
> + const struct sfdp_parameter_header *param_header)
> {
> static const struct sfdp_4bait reads[] = {
> { SNOR_HWCAPS_READ, BIT(0) },
> @@ -975,8 +963,8 @@ static int spi_nor_parse_4bait(struct spi_nor *nor,
> { 0u /* not used */, BIT(11) },
> { 0u /* not used */, BIT(12) },
> };
> - struct spi_nor_pp_command *params_pp = params->page_programs;
> - struct spi_nor_erase_map *map = ¶ms->erase_map;
> + struct spi_nor_pp_command *params_pp = nor->params->page_programs;
> + struct spi_nor_erase_map *map = &nor->params->erase_map;
> struct spi_nor_erase_type *erase_type = map->erase_type;
> u32 *dwords;
> size_t len;
> @@ -1013,7 +1001,7 @@ static int spi_nor_parse_4bait(struct spi_nor *nor,
> const struct sfdp_4bait *read = &reads[i];
>
> discard_hwcaps |= read->hwcaps;
> - if ((params->hwcaps.mask & read->hwcaps) &&
> + if ((nor->params->hwcaps.mask & read->hwcaps) &&
> (dwords[0] & read->supported_bit))
> read_hwcaps |= read->hwcaps;
> }
> @@ -1029,8 +1017,8 @@ static int spi_nor_parse_4bait(struct spi_nor *nor,
> /*
> * The 4 Byte Address Instruction (Optional) Table is the only
> * SFDP table that indicates support for Page Program Commands.
> - * Bypass the params->hwcaps.mask and consider 4BAIT the biggest
> - * authority for specifying Page Program support.
> + * Bypass the nor->params->hwcaps.mask and consider 4BAIT the
> + * biggest authority for specifying Page Program support.
> */
> discard_hwcaps |= program->hwcaps;
> if (dwords[0] & program->supported_bit)
> @@ -1064,12 +1052,12 @@ static int spi_nor_parse_4bait(struct spi_nor *nor,
> * Discard all operations from the 4-byte instruction set which are
> * not supported by this memory.
> */
> - params->hwcaps.mask &= ~discard_hwcaps;
> - params->hwcaps.mask |= (read_hwcaps | pp_hwcaps);
> + nor->params->hwcaps.mask &= ~discard_hwcaps;
> + nor->params->hwcaps.mask |= (read_hwcaps | pp_hwcaps);
>
> /* Use the 4-byte address instruction set. */
> for (i = 0; i < SNOR_CMD_READ_MAX; i++) {
> - struct spi_nor_read_command *read_cmd = ¶ms->reads[i];
> + struct spi_nor_read_command *read_cmd = &nor->params->reads[i];
Nitpick: 'nor->params' is used in multiple places in this function.
Might be worth it to make it a local variable.
Either way,
Reviewed-by: Pratyush Yadav <p.ya...@ti.com>
>
> read_cmd->opcode = spi_nor_convert_3to4_read(read_cmd->opcode);
> }
[...]
--
Regards,
Pratyush Yadav
Texas Instruments Inc.
