From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Herring 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> References: <1312579468-19365-1-git-send-email-robherring2@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1312579468-19365-1-git-send-email-robherring2@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org Sender: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org To: Grant Likely 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 List-Id: linux-i2c@vger.kernel.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); -- 1.7.4.1