From patchwork Fri Oct 14 19:31:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Ramsauer X-Patchwork-Id: 9377343 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5318A607FD for ; Fri, 14 Oct 2016 19:39:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 406002A7E4 for ; Fri, 14 Oct 2016 19:39:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 34A9D2A835; Fri, 14 Oct 2016 19:39:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4FC6F2A7E4 for ; Fri, 14 Oct 2016 19:39:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753589AbcJNTjO (ORCPT ); Fri, 14 Oct 2016 15:39:14 -0400 Received: from ramses-pyramidenbau.de ([37.120.178.10]:57474 "EHLO mail.ramses-pyramidenbau.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750929AbcJNTjO (ORCPT ); Fri, 14 Oct 2016 15:39:14 -0400 X-Greylist: delayed 451 seconds by postgrey-1.27 at vger.kernel.org; Fri, 14 Oct 2016 15:39:13 EDT Received: from omega.home (unknown [IPv6:2a02:810d:25c0:a78::4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.ramses-pyramidenbau.de (Postfix) with ESMTPSA id 3B9EE12300F; Fri, 14 Oct 2016 21:32:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ramses-pyramidenbau.de; s=default; t=1476473547; bh=gERychUh3HREBXlrOHfFJUYdjG81Ylqzge6D6SI94cM=; h=From:To:Cc:Subject:Date; b=sgBgbK5nYzPTCb3k/cbrN7qj2ymAo5S7eNJ9PH1jyqoLOApVtAV4ZRuX+RbZe835I ZwpazW6X2PsD5/bLbJ2pnLk/68s634yHEBHPQa691rj2WloJYe198pHAtePXQeLvXg 62C1J9SWINtj6J9h2PBj1hPXJiyi0ZtZyO+sW61M= From: Ralf Ramsauer To: Mark Brown , linux-spi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Ralf Ramsauer , Geert Uytterhoeven Subject: [PATCH] spi: mark device nodes only in case of successful instantiation Date: Fri, 14 Oct 2016 21:31:13 +0200 Message-Id: <20161014193113.29275-1-ralf@ramses-pyramidenbau.de> X-Mailer: git-send-email 2.10.1 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 the fail during initialisation: If a node failed during registration, it won't be unloaded and hence never be unmarked again. So 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. Fixes: bd6c164 ("spi: Mark instantiated device nodes with OF_POPULATE") Signed-off-by: Ralf Ramsauer Cc: Geert Uytterhoeven --- Hi, imagine the following situation: you loaded a spi driver as module, but it fails to instantiate, because of some reasons (e.g. some resources, like gpios, might be in use in userspace). When reloading the driver, _all_ nodes, including previously failed ones, should be probed again. This is not the case at the moment. Current behaviour only re-registers nodes that were previously successfully loaded. This small patches fixes this behaviour. I stumbled over this while working on a spi driver. Ralf drivers/spi/spi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 200ca22..f96a04e 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1604,12 +1604,15 @@ static void of_register_spi_devices(struct spi_master *master) return; for_each_available_child_of_node(master->dev.of_node, nc) { - if (of_node_test_and_set_flag(nc, OF_POPULATED)) + if (of_node_check_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); + continue; + } + of_node_set_flag(nc, OF_POPULATED); } } #else