1 files changed, 20 insertions, 10 deletions

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index f0bd5bcdf563..e5f76a0372fd 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -537,9 +537,7 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info)
         client->dev.parent = &client->adapter->dev;
         client->dev.bus = &i2c_bus_type;
         client->dev.type = &i2c_client_type;
-#ifdef CONFIG_OF
         client->dev.of_node = info->of_node;
-#endif
 
         dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adap),
                      client->addr);
@@ -799,6 +797,9 @@ static int i2c_do_add_adapter(struct i2c_driver *driver,
 
         /* Let legacy drivers scan this bus for matching devices */
         if (driver->attach_adapter) {
+                dev_warn(&adap->dev, "attach_adapter method is deprecated\n");
+                dev_warn(&adap->dev, "Please use another way to instantiate "
+                         "your i2c_client\n");
                 /* We ignore the return code; if it fails, too bad */
                 driver->attach_adapter(adap);
         }
@@ -983,6 +984,7 @@ static int i2c_do_del_adapter(struct i2c_driver *driver,
 
         if (!driver->detach_adapter)
                 return 0;
+        dev_warn(&adapter->dev, "detach_adapter method is deprecated\n");
         res = driver->detach_adapter(adapter);
         if (res)
                 dev_err(&adapter->dev, "detach_adapter failed (%d) "
@@ -1093,6 +1095,18 @@ EXPORT_SYMBOL(i2c_del_adapter);
 
 /* ------------------------------------------------------------------------- */
 
+int i2c_for_each_dev(void *data, int (*fn)(struct device *, void *))
+{
+        int res;
+
+        mutex_lock(&core_lock);
+        res = bus_for_each_dev(&i2c_bus_type, NULL, data, fn);
+        mutex_unlock(&core_lock);
+
+        return res;
+}
+EXPORT_SYMBOL_GPL(i2c_for_each_dev);
+
 static int __process_new_driver(struct device *dev, void *data)
 {
         if (dev->type != &i2c_adapter_type)
@@ -1136,9 +1150,7 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver)
 
         INIT_LIST_HEAD(&driver->clients);
         /* Walk the adapters that are already present */
-        mutex_lock(&core_lock);
-        bus_for_each_dev(&i2c_bus_type, NULL, driver, __process_new_driver);
-        mutex_unlock(&core_lock);
+        i2c_for_each_dev(driver, __process_new_driver);
 
         return 0;
 }
@@ -1158,9 +1170,7 @@ static int __process_removed_driver(struct device *dev, void *data)
  */
 void i2c_del_driver(struct i2c_driver *driver)
 {
-        mutex_lock(&core_lock);
-        bus_for_each_dev(&i2c_bus_type, NULL, driver, __process_removed_driver);
-        mutex_unlock(&core_lock);
+        i2c_for_each_dev(driver, __process_removed_driver);
 
         driver_unregister(&driver->driver);
         pr_debug("i2c-core: driver [%s] unregistered\n", driver->driver.name);
@@ -1583,12 +1593,12 @@ i2c_new_probed_device(struct i2c_adapter *adap,
 }
 EXPORT_SYMBOL_GPL(i2c_new_probed_device);
 
-struct i2c_adapter *i2c_get_adapter(int id)
+struct i2c_adapter *i2c_get_adapter(int nr)
 {
         struct i2c_adapter *adapter;
 
         mutex_lock(&core_lock);
-        adapter = idr_find(&i2c_adapter_idr, id);
+        adapter = idr_find(&i2c_adapter_idr, nr);
         if (adapter && !try_module_get(adapter->owner))
                 adapter = NULL;