Re: [PATCH v2 21/35] mtd: spi-nor: Introduce spi_nor_set_mtd_info()

Pratyush Yadav
2021-08-17T16:25:13Z

On 27/07/21 07:52AM, Tudor Ambarus wrote:
> Used to init all the mtd_info fields. Move the mtd_info init
> the last thing in the spi_nor_scan(), so that we avoid superfluous
> initialization of the mtd_info fields in case of errors.
>
> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
> ---
> drivers/mtd/spi-nor/core.c | 55 +++++++++++++++++++++-----------------
> 1 file changed, 31 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
> index 5c8cffb5e6f2..26acfc9901db 100644
> --- a/drivers/mtd/spi-nor/core.c
> +++ b/drivers/mtd/spi-nor/core.c
> @@ -3124,6 +3124,36 @@ static const struct flash_info *spi_nor_get_flash_info(struct spi_nor *nor,
> return info;
> }
>
> +static void spi_nor_set_mtd_info(struct spi_nor *nor)
> +{
> + struct mtd_info *mtd = &nor->mtd;
> + struct device *dev = nor->dev;
> +
> + spi_nor_register_locking_ops(nor);
> +
> + /* Configure OTP parameters and ops */
> + spi_nor_otp_init(nor);
> +
> + mtd->dev.parent = dev;
> + if (!mtd->name)
> + mtd->name = dev_name(dev);
> + mtd->priv = nor;

You remove the lines setting mtd->priv in the previous patch. Why add it
back?

Other than this,

Reviewed-by: Pratyush Yadav <p.yadav@ti.com>

> + mtd->type = MTD_NORFLASH;
> + mtd->flags = MTD_CAP_NORFLASH;
> + if (nor->info->flags & SPI_NOR_NO_ERASE)
> + mtd->flags |= MTD_NO_ERASE;
> + mtd->writesize = nor->params->writesize;
> + mtd->writebufsize = nor->page_size;
> + mtd->size = nor->params->size;
> + mtd->_erase = spi_nor_erase;
> + mtd->_read = spi_nor_read;
> + mtd->_write = spi_nor_write;
> + mtd->_suspend = spi_nor_suspend;
> + mtd->_resume = spi_nor_resume;
> + mtd->_get_device = spi_nor_get_device;
> + mtd->_put_device = spi_nor_put_device;
> +}
> +
> int spi_nor_scan(struct spi_nor *nor, const char *name,
> const struct spi_nor_hwcaps *hwcaps)
> {
> @@ -3166,32 +3196,12 @@ int spi_nor_scan(struct spi_nor *nor, const char *name,
>
> mutex_init(&nor->lock);
>
> - mtd->_write = spi_nor_write;
> -
> /* Init flash parameters based on flash_info struct and SFDP */
> ret = spi_nor_init_params(nor);
> if (ret)
> return ret;
>
> - if (!mtd->name)
> - mtd->name = dev_name(dev);
> - mtd->type = MTD_NORFLASH;
> - mtd->writesize = nor->params->writesize;
> - mtd->flags = MTD_CAP_NORFLASH;
> - mtd->size = nor->params->size;
> - mtd->_erase = spi_nor_erase;
> - mtd->_read = spi_nor_read;
> - mtd->_suspend = spi_nor_suspend;
> - mtd->_resume = spi_nor_resume;
> - mtd->_get_device = spi_nor_get_device;
> - mtd->_put_device = spi_nor_put_device;
> -
> - if (info->flags & SPI_NOR_NO_ERASE)
> - mtd->flags |= MTD_NO_ERASE;
> -
> - mtd->dev.parent = dev;
> nor->page_size = nor->params->page_size;
> - mtd->writebufsize = nor->page_size;
>
> /*
> * Configure the SPI memory:
> @@ -3207,15 +3217,12 @@ int spi_nor_scan(struct spi_nor *nor, const char *name,
> if (ret)
> return ret;
>
> - spi_nor_register_locking_ops(nor);
> -
> /* Send all the required SPI flash commands to initialize device */
> ret = spi_nor_init(nor);
> if (ret)
> return ret;
>
> - /* Configure OTP parameters and ops */
> - spi_nor_otp_init(nor);
> + spi_nor_set_mtd_info(nor);
>
> if (!nor->name)
> nor->name = info->name;
> --
> 2.25.1
>

--
Regards,
Pratyush Yadav
Texas Instruments Inc.