4 files changed, 20 insertions, 6 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index f487c6918d78..7ce623bb9637 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -645,3 +645,12 @@ Who:	Florian Westphal <fw@strlen.de>
 Files:  include/linux/netfilter_ipv4/ipt_addrtype.h
 
 ----------------------------
+
+What:   i2c_driver.attach_adapter
+        i2c_driver.detach_adapter
+When:   September 2011
+Why:    These legacy callbacks should no longer be used as i2c-core offers
+        a variety of preferable alternative ways to instantiate I2C devices.
+Who:    Jean Delvare <khali@linux-fr.org>
+
+----------------------------
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index 23ac61e2db39..beee6b2d361d 100644
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -10,3 +10,4 @@ obj-$(CONFIG_I2C_MUX)		+= i2c-mux.o
 obj-y                           += algos/ busses/ muxes/
 
 ccflags-$(CONFIG_I2C_DEBUG_CORE) := -DDEBUG
+CFLAGS_i2c-core.o := -Wno-deprecated-declarations
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index b9fa1d0320b4..e5f76a0372fd 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -797,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);
         }
@@ -981,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) "
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 4df12c7e69d7..cd2f75b742ec 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -104,8 +104,8 @@ extern s32 i2c_smbus_write_i2c_block_data(const struct i2c_client *client,
 /**
  * struct i2c_driver - represent an I2C device driver
  * @class: What kind of i2c device we instantiate (for detect)
- * @attach_adapter: Callback for bus addition (for legacy drivers)
- * @detach_adapter: Callback for bus removal (for legacy drivers)
+ * @attach_adapter: Callback for bus addition (deprecated)
+ * @detach_adapter: Callback for bus removal (deprecated)
  * @probe: Callback for device binding
  * @remove: Callback for device unbinding
  * @shutdown: Callback for device shutdown
@@ -143,11 +143,11 @@ struct i2c_driver {
         unsigned int class;
 
         /* Notifies the driver that a new bus has appeared or is about to be
-         * removed. You should avoid using this if you can, it will probably
-         * be removed in a near future.
+         * removed. You should avoid using this, it will be removed in a
+         * near future.
          */
-        int (*attach_adapter)(struct i2c_adapter *);
-        int (*detach_adapter)(struct i2c_adapter *);
+        int (*attach_adapter)(struct i2c_adapter *) __deprecated;
+        int (*detach_adapter)(struct i2c_adapter *) __deprecated;
 
         /* Standard driver model interfaces */
         int (*probe)(struct i2c_client *, const struct i2c_device_id *);