aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-ocores.c
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2013-07-11 07:56:15 -0400
committerWolfram Sang <wsa@the-dreams.de>2013-08-23 04:22:20 -0400
commit687b81d083c082bc1e853032e3a2a54f8c251d27 (patch)
tree60ce91a6ecc84a8bfd1968772cd081c0afdce0f8 /drivers/i2c/busses/i2c-ocores.c
parentc1d15b68aab86f1f3b602fa65e7618c0065d46e6 (diff)
i2c: move OF helpers into the core
I2C of helpers used to live in of_i2c.c but experience (from SPI) shows that it is much cleaner to have this in the core. This also removes a circular dependency between the helpers and the core, and so we can finally register child nodes in the core instead of doing this manually in each driver. So, fix the drivers and documentation, too. Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c/busses/i2c-ocores.c')
-rw-r--r--drivers/i2c/busses/i2c-ocores.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
index e14182cd87ff..c61f37a10a07 100644
--- a/drivers/i2c/busses/i2c-ocores.c
+++ b/drivers/i2c/busses/i2c-ocores.c
@@ -24,7 +24,6 @@
24#include <linux/i2c-ocores.h> 24#include <linux/i2c-ocores.h>
25#include <linux/slab.h> 25#include <linux/slab.h>
26#include <linux/io.h> 26#include <linux/io.h>
27#include <linux/of_i2c.h>
28#include <linux/log2.h> 27#include <linux/log2.h>
29 28
30struct ocores_i2c { 29struct ocores_i2c {
@@ -432,8 +431,6 @@ static int ocores_i2c_probe(struct platform_device *pdev)
432 if (pdata) { 431 if (pdata) {
433 for (i = 0; i < pdata->num_devices; i++) 432 for (i = 0; i < pdata->num_devices; i++)
434 i2c_new_device(&i2c->adap, pdata->devices + i); 433 i2c_new_device(&i2c->adap, pdata->devices + i);
435 } else {
436 of_i2c_register_devices(&i2c->adap);
437 } 434 }
438 435
439 return 0; 436 return 0;