Re: [PATCH v2 1/2] spi: mark device nodes only in case of successful instantiation

[Pantelis Antoniou]

Hi Ralf,

> On Oct 17, 2016, at 16:59 , Ralf Ramsauer <ralf@xxxxxxxxxxxxxxxxxxxxxx> wrote:
> 
> Instantiated SPI device nodes are marked with OF_POPULATE. This was
> introduced in bd6c164. On unloading, loaded device nodes will of course
> be unmarked. The problem are nodes that fail during initialisation: If a
> node fails, it won't be unloaded and hence not be unmarked.
> 
> If a SPI driver module is unloaded and reloaded, it will skip nodes that
> failed before.
> 
> Skip device nodes that are already populated and mark them only in case
> of success.
> 
> Note that the same issue exists for I2C.
> 
> Fixes: bd6c164 ("spi: Mark instantiated device nodes with OF_POPULATE")
> Signed-off-by: Ralf Ramsauer <ralf@xxxxxxxxxxxxxxxxxxxxxx>
> ---
> drivers/spi/spi.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
> index 5787b72..838783c 100644
> --- a/drivers/spi/spi.c
> +++ b/drivers/spi/spi.c
> @@ -1618,9 +1618,11 @@ static void of_register_spi_devices(struct spi_master *master)
> 		if (of_node_test_and_set_flag(nc, OF_POPULATED))
> 			continue;
> 		spi = of_register_spi_device(master, nc);
> -		if (IS_ERR(spi))
> +		if (IS_ERR(spi)) {
> 			dev_warn(&master->dev, "Failed to create SPI device for %s\n",
> 				nc->full_name);
> +			of_node_clear_flag(nc, OF_POPULATED);
> +		}
> 	}
> }
> #else
> @@ -3131,6 +3133,7 @@ static int of_spi_notify(struct notifier_block *nb, unsigned long action,
> 		if (IS_ERR(spi)) {
> 			pr_err("%s: failed to create for '%s'\n",
> 					__func__, rd->dn->full_name);
> +			of_node_clear_flag(rd->dn, OF_POPULATED);
> 			return notifier_from_errno(PTR_ERR(spi));
> 		}
> 		break;
> -- 
> 2.10.1
> 

Thanks for this.

Acked-by: Pantelis Antoniou <pantelis.antoniou@xxxxxxxxxxxx>