From patchwork Mon Oct 17 13:59:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Ramsauer X-Patchwork-Id: 9379349 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 A8B0D608A7 for ; Mon, 17 Oct 2016 14:00:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B19D2910C for ; Mon, 17 Oct 2016 14:00:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D3DE29221; Mon, 17 Oct 2016 14:00:41 +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 A38D829221 for ; Mon, 17 Oct 2016 14:00:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933692AbcJQOAc (ORCPT ); Mon, 17 Oct 2016 10:00:32 -0400 Received: from ramses-pyramidenbau.de ([37.120.178.10]:43058 "EHLO mail.ramses-pyramidenbau.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933239AbcJQOAK (ORCPT ); Mon, 17 Oct 2016 10:00:10 -0400 Received: from pluto.local (unknown [IPv6:2001:638:a01:8061:aefd:ceff:fef3:ba65]) (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 47FD0123B31; Mon, 17 Oct 2016 16:01:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ramses-pyramidenbau.de; s=default; t=1476712878; bh=IntTt/CDtSgG6NVTj4QOUPnl8U21UaY58VDun3suPUA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hR5DeoUdZaR5mfhmXtqi2Uth+6mEm7zxXLfQToH9w5jTkxutoO++hqey8iPjMcY6W jsyUxB5qxDqRs4F+2+LT0gPdVDDLHpty9qae5ApfgrXL7+kekXLE6lZef8i1rarHT3 hFbH1ccfwWLOKodh8CJtvG2GTERuqIHQVFNDyA6U= From: Ralf Ramsauer To: Mark Brown , Geert Uytterhoeven , Wolfram Sang , Linux SPI , Linux I2C Cc: Ralf Ramsauer , "linux-kernel @ vger . kernel . org" , Pantelis Antoniou Subject: [PATCH v2 2/2] i2c: mark device nodes only in case of successful instantiation Date: Mon, 17 Oct 2016 15:59:57 +0200 Message-Id: <20161017135957.20297-3-ralf@ramses-pyramidenbau.de> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161017135957.20297-1-ralf@ramses-pyramidenbau.de> References: <20161017135957.20297-1-ralf@ramses-pyramidenbau.de> 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 I2C device nodes are marked with OF_POPULATE. This was introduced in 4f001fd. 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 I2C 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 SPI. Fixes: 4f001fd ("i2c: Mark instantiated device nodes with OF_POPULATE") Signed-off-by: Ralf Ramsauer Reviewed-by: Geert Uytterhoeven Acked-by: Pantelis Antoniou --- drivers/i2c/i2c-core.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 5ab6721..1704fc8 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -1681,6 +1681,7 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap, static void of_i2c_register_devices(struct i2c_adapter *adap) { struct device_node *bus, *node; + struct i2c_client *client; /* Only register child devices if the adapter has a node pointer set */ if (!adap->dev.of_node) @@ -1695,7 +1696,14 @@ static void of_i2c_register_devices(struct i2c_adapter *adap) for_each_available_child_of_node(bus, node) { if (of_node_test_and_set_flag(node, OF_POPULATED)) continue; - of_i2c_register_device(adap, node); + + client = of_i2c_register_device(adap, node); + if (IS_ERR(client)) { + dev_warn(&adap->dev, + "Failed to create I2C device for %s\n", + node->full_name); + of_node_clear_flag(node, OF_POPULATED); + } } of_node_put(bus); @@ -2299,6 +2307,7 @@ static int of_i2c_notify(struct notifier_block *nb, unsigned long action, if (IS_ERR(client)) { dev_err(&adap->dev, "failed to create client for '%s'\n", rd->dn->full_name); + of_node_clear_flag(rd->dn, OF_POPULATED); return notifier_from_errno(PTR_ERR(client)); } break;