From patchwork Fri Aug 5 21:24:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 108739 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id A9123B7429 for ; Sat, 6 Aug 2011 07:24:55 +1000 (EST) Received: from mail-yx0-f179.google.com (mail-yx0-f179.google.com [209.85.213.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 8D3E8B6F75 for ; Sat, 6 Aug 2011 07:24:41 +1000 (EST) Received: by yxm34 with SMTP id 34so2118624yxm.38 for ; Fri, 05 Aug 2011 14:24:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=dF83mmurmdRU9FHlqpsCTO/e4WzODiOco/e90ob5/wQ=; b=oBOZ2LOl4UM/7Lr2EWGoQLFQvpqMAMBoYD46q4JchxoL0YOdRgd0W2E++dSxn9qmGO 9+Hy6iPt4D6ZQuCS86VNa/ddCYWsnew6aek1JUx8T66bOt6Myp9dcuqkbfwt2HKVnBJc hh8KpdWaGcCQP2wl+Z15SsVDSt1E9SQDOYaO4= Received: by 10.42.166.138 with SMTP id o10mr241977icy.128.1312579476661; Fri, 05 Aug 2011 14:24:36 -0700 (PDT) Received: from rob-laptop.i.smooth-stone.com ([173.226.190.126]) by mx.google.com with ESMTPS id d5sm2280695ibi.11.2011.08.05.14.24.35 (version=SSLv3 cipher=OTHER); Fri, 05 Aug 2011 14:24:36 -0700 (PDT) From: Rob Herring To: Grant Likely Subject: [PATCH 1/3] i2c: move of_i2c_register_devices call into core Date: Fri, 5 Aug 2011 16:24:26 -0500 Message-Id: <1312579468-19365-2-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1312579468-19365-1-git-send-email-robherring2@gmail.com> References: <1312579468-19365-1-git-send-email-robherring2@gmail.com> Cc: Stephen Warren , Sebastian Andrzej Siewior , Rob Herring , linux-kernel@vger.kernel.org, Dirk Brandewie , linux-i2c@vger.kernel.org, Ben Dooks , Jean Delvare , linuxppc-dev@lists.ozlabs.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org From: Rob Herring All callers of of_i2c_register_devices are immediately preceded by a call to i2c_add_adapter or i2c_add_numbered_adapter. Add call to of_i2c_register_devices and remove all other callers. This causes a module dependency loop that is resolved by the next commit. Signed-off-by: Rob Herring Cc: Grant Likely Cc: Jochen Friedrich Cc: Jean Delvare Cc: Ben Dooks Cc: Sebastian Andrzej Siewior Cc: Dirk Brandewie Cc: Stephen Warren Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-i2c@vger.kernel.org --- drivers/i2c/busses/i2c-cpm.c | 6 ------ drivers/i2c/busses/i2c-ibm_iic.c | 4 ---- drivers/i2c/busses/i2c-mpc.c | 2 -- drivers/i2c/busses/i2c-pxa.c | 2 -- drivers/i2c/busses/i2c-tegra.c | 3 --- drivers/i2c/i2c-core.c | 4 ++++ 6 files changed, 4 insertions(+), 17 deletions(-) diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c index b1d9cd2..7cbc82a 100644 --- a/drivers/i2c/busses/i2c-cpm.c +++ b/drivers/i2c/busses/i2c-cpm.c @@ -42,7 +42,6 @@ #include #include #include -#include #include #include @@ -673,11 +672,6 @@ static int __devinit cpm_i2c_probe(struct platform_device *ofdev) dev_dbg(&ofdev->dev, "hw routines for %s registered.\n", cpm->adap.name); - /* - * register OF I2C devices - */ - of_i2c_register_devices(&cpm->adap); - return 0; out_shut: cpm_i2c_shutdown(cpm); diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c index 3c110fb..5ba15ba 100644 --- a/drivers/i2c/busses/i2c-ibm_iic.c +++ b/drivers/i2c/busses/i2c-ibm_iic.c @@ -42,7 +42,6 @@ #include #include #include -#include #include "i2c-ibm_iic.h" @@ -759,9 +758,6 @@ static int __devinit iic_probe(struct platform_device *ofdev) dev_info(&ofdev->dev, "using %s mode\n", dev->fast_mode ? "fast (400 kHz)" : "standard (100 kHz)"); - /* Now register all the child nodes */ - of_i2c_register_devices(adap); - return 0; error_cleanup: diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index 107397a..a433f59 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include @@ -637,7 +636,6 @@ static int __devinit fsl_i2c_probe(struct platform_device *op) dev_err(i2c->dev, "failed to add adapter\n"); goto fail_add; } - of_i2c_register_devices(&i2c->adap); return result; diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index d603646..c1c2885 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -1147,7 +1146,6 @@ static int i2c_pxa_probe(struct platform_device *dev) printk(KERN_INFO "I2C: Failed to add bus\n"); goto eadapt; } - of_i2c_register_devices(&i2c->adap); platform_set_drvdata(dev, i2c); diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index 2440b74..9ec0a58 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -26,7 +26,6 @@ #include #include #include -#include #include @@ -653,8 +652,6 @@ static int tegra_i2c_probe(struct platform_device *pdev) goto err_free_irq; } - of_i2c_register_devices(&i2c_dev->adapter); - return 0; err_free_irq: free_irq(i2c_dev->irq, i2c_dev); diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 131079a..011e195 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -863,6 +864,9 @@ static int i2c_register_adapter(struct i2c_adapter *adap) if (adap->nr < __i2c_first_dynamic_bus_num) i2c_scan_static_board_info(adap); + /* Register devices from the device tree */ + of_i2c_register_devices(adap); + /* Notify drivers */ mutex_lock(&core_lock); bus_for_each_drv(&i2c_bus_type, NULL, adap, __process_new_adapter);