aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-designware-platdrv.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-designware-platdrv.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-designware-platdrv.c')
-rw-r--r--drivers/i2c/busses/i2c-designware-platdrv.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index 64ffb908641c..ded77c3bd59c 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -35,7 +35,6 @@
35#include <linux/err.h> 35#include <linux/err.h>
36#include <linux/interrupt.h> 36#include <linux/interrupt.h>
37#include <linux/of.h> 37#include <linux/of.h>
38#include <linux/of_i2c.h>
39#include <linux/platform_device.h> 38#include <linux/platform_device.h>
40#include <linux/pm.h> 39#include <linux/pm.h>
41#include <linux/pm_runtime.h> 40#include <linux/pm_runtime.h>
@@ -172,7 +171,6 @@ static int dw_i2c_probe(struct platform_device *pdev)
172 dev_err(&pdev->dev, "failure adding adapter\n"); 171 dev_err(&pdev->dev, "failure adding adapter\n");
173 return r; 172 return r;
174 } 173 }
175 of_i2c_register_devices(adap);
176 acpi_i2c_register_devices(adap); 174 acpi_i2c_register_devices(adap);
177 175
178 pm_runtime_set_autosuspend_delay(&pdev->dev, 1000); 176 pm_runtime_set_autosuspend_delay(&pdev->dev, 1000);