Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935535AbcJQTQF (ORCPT ); Mon, 17 Oct 2016 15:16:05 -0400 Received: from mail-qk0-f171.google.com ([209.85.220.171]:33700 "EHLO mail-qk0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935062AbcJQTP6 (ORCPT ); Mon, 17 Oct 2016 15:15:58 -0400 Subject: Re: [PATCH v2 1/2] spi: mark device nodes only in case of successful instantiation Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Content-Type: text/plain; charset=us-ascii From: Pantelis Antoniou In-Reply-To: <20161017135957.20297-2-ralf@ramses-pyramidenbau.de> Date: Mon, 17 Oct 2016 22:16:07 +0300 Cc: Mark Brown , Geert Uytterhoeven , Wolfram Sang , Linux SPI , Linux I2C , "linux-kernel @ vger . kernel . org" Message-Id: <7E9AA420-8A88-43DE-BB68-568E3BA5472E@konsulko.com> References: <20161017135957.20297-1-ralf@ramses-pyramidenbau.de> <20161017135957.20297-2-ralf@ramses-pyramidenbau.de> To: Ralf Ramsauer X-Mailer: Apple Mail (2.3124) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by mail.home.local id u9HJG8pw005212 Content-Length: 1793 Lines: 57 Hi Ralf, > On Oct 17, 2016, at 16:59 , Ralf Ramsauer 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 > --- > 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