From: Grant Likely <grant.likely@secretlab•ca>
To: Rob Herring <robherring2@gmail•com>
Cc: Stephen Warren <swarren@nvidia•com>,
Sebastian Andrzej Siewior <bigeasy@linutronix•de>,
Rob Herring <rob.herring@calxeda•com>,
linux-kernel@vger•kernel.org,
Dirk Brandewie <dirk.brandewie@gmail•com>,
linux-i2c@vger•kernel.org, Ben Dooks <ben-linux@fluff•org>,
Jean Delvare <khali@linux-fr•org>,
linuxppc-dev@lists•ozlabs.org
Subject: Re: [PATCH 1/3] i2c: move of_i2c_register_devices call into core
Date: Fri, 5 Aug 2011 23:54:35 +0100 [thread overview]
Message-ID: <20110805225435.GA6404@ponder.secretlab.ca> (raw)
In-Reply-To: <1312579468-19365-2-git-send-email-robherring2@gmail.com>
On Fri, Aug 05, 2011 at 04:24:26PM -0500, Rob Herring wrote:
> From: Rob Herring <rob.herring@calxeda•com>
>
> 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.
Wrong way around. Don't break bisectability. I'll leave it up to Ben
and Jean on weather or not they want to move this code. I intend to
do the same thing for spi/gpio, but I maintain those subsystems so I
get to choose. i2c is not up to me.
g.
>
> Signed-off-by: Rob Herring <rob.herring@calxeda•com>
> Cc: Grant Likely <grant.likely@secretlab•ca>
> Cc: Jochen Friedrich <jochen@scram•de>
> Cc: Jean Delvare <khali@linux-fr•org>
> Cc: Ben Dooks <ben-linux@fluff•org>
> Cc: Sebastian Andrzej Siewior <bigeasy@linutronix•de>
> Cc: Dirk Brandewie <dirk.brandewie@gmail•com>
> Cc: Stephen Warren <swarren@nvidia•com>
> 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 <linux/dma-mapping.h>
> #include <linux/of_device.h>
> #include <linux/of_platform.h>
> -#include <linux/of_i2c.h>
> #include <sysdev/fsl_soc.h>
> #include <asm/cpm.h>
>
> @@ -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 <linux/io.h>
> #include <linux/i2c.h>
> #include <linux/of_platform.h>
> -#include <linux/of_i2c.h>
>
> #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 <linux/sched.h>
> #include <linux/init.h>
> #include <linux/of_platform.h>
> -#include <linux/of_i2c.h>
> #include <linux/slab.h>
>
> #include <linux/io.h>
> @@ -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 <linux/errno.h>
> #include <linux/interrupt.h>
> #include <linux/i2c-pxa.h>
> -#include <linux/of_i2c.h>
> #include <linux/platform_device.h>
> #include <linux/err.h>
> #include <linux/clk.h>
> @@ -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 <linux/delay.h>
> #include <linux/slab.h>
> #include <linux/i2c-tegra.h>
> -#include <linux/of_i2c.h>
>
> #include <asm/unaligned.h>
>
> @@ -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 <linux/init.h>
> #include <linux/idr.h>
> #include <linux/mutex.h>
> +#include <linux/of_i2c.h>
> #include <linux/of_device.h>
> #include <linux/completion.h>
> #include <linux/hardirq.h>
> @@ -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
>
next prev parent reply other threads:[~2011-08-05 22:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1312579468-19365-1-git-send-email-robherring2@gmail.com>
2011-08-05 21:24 ` [PATCH 1/3] i2c: move of_i2c_register_devices call into core Rob Herring
2011-08-05 22:54 ` Grant Likely [this message]
2011-08-05 23:22 ` Rob Herring
2011-09-02 9:23 ` Jean Delvare
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110805225435.GA6404@ponder.secretlab.ca \
--to=grant.likely@secretlab$(echo .)ca \
--cc=ben-linux@fluff$(echo .)org \
--cc=bigeasy@linutronix$(echo .)de \
--cc=dirk.brandewie@gmail$(echo .)com \
--cc=khali@linux-fr$(echo .)org \
--cc=linux-i2c@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=rob.herring@calxeda$(echo .)com \
--cc=robherring2@gmail$(echo .)com \
--cc=swarren@nvidia$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox