[PATCH] mtd: rawnand: intel: remove broken code

Miquel Raynal miquel.raynal at bootlin.com
Mon Jan 4 03:48:49 EST 2021


Hi Martin,

Martin Blumenstingl <martin.blumenstingl at googlemail.com> wrote on Thu,
17 Dec 2020 23:11:48 +0100:

> Drop the check for mtd->name as it's executed while the mtd variable is
> always NULL. If some MTD name is needed then it should be validated by
> the MTD core.
> 
> While here, also drop the NULL assignment to the mtd variable as it's
> overwritten later on anyways and the NULL value is never read.
> 
> Fixes: 0b1039f016e8a3 ("mtd: rawnand: Add NAND controller support on Intel LGM SoC")
> Signed-off-by: Martin Blumenstingl <martin.blumenstingl at googlemail.com>
> ---
> I found this by looking at the new driver. This patch is compile-tested
> only.
> 
> 
>  drivers/mtd/nand/raw/intel-nand-controller.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/drivers/mtd/nand/raw/intel-nand-controller.c b/drivers/mtd/nand/raw/intel-nand-controller.c
> index fdb112e8a90d..398de6ec68d7 100644
> --- a/drivers/mtd/nand/raw/intel-nand-controller.c
> +++ b/drivers/mtd/nand/raw/intel-nand-controller.c
> @@ -579,7 +579,7 @@ static int ebu_nand_probe(struct platform_device *pdev)
>  	struct device *dev = &pdev->dev;
>  	struct ebu_nand_controller *ebu_host;
>  	struct nand_chip *nand;
> -	struct mtd_info *mtd = NULL;
> +	struct mtd_info *mtd;
>  	struct resource *res;
>  	char *resname;
>  	int ret;
> @@ -647,10 +647,6 @@ static int ebu_nand_probe(struct platform_device *pdev)
>  	       ebu_host->ebu + EBU_ADDR_SEL(cs));
>  
>  	nand_set_flash_node(&ebu_host->chip, dev->of_node);
> -	if (!mtd->name) {
> -		dev_err(ebu_host->dev, "NAND label property is mandatory\n");
> -		return -EINVAL;
> -	}

This is valid code, it's best to use a label = "my-storage"; property
in your NAND DT node. Then mtd->name will be updated by
nand_set_flash_node().

Thanks,
Miquèl



More information about the linux-mtd mailing list