summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2011-03-20 14:50:53 +0100
committerJean Delvare <khali@endymion.delvare>2011-03-20 14:50:53 +0100
commitc185a9420bd1c645252249018e6887a968d3e1de (patch)
tree1777ff0e774382d4d3c5aadb29431026d7275b9a
parentfe6fc25857d293546bd400432cdb77866c797c9b (diff)
i2c: Drop i2c_adapter.id
There is no user left of i2c_adapter.id, so we can get rid of it. Finally! :) Signed-off-by: Jean Delvare <khali@linux-fr.org>
-rw-r--r--Documentation/feature-removal-schedule.txt10
-rw-r--r--include/linux/i2c.h1
2 files changed, 0 insertions, 11 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 7ce623bb963..895330940f5 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -585,16 +585,6 @@ Who: NeilBrown <neilb@suse.de>
----------------------------
-What: i2c_adapter.id
-When: June 2011
-Why: This field is deprecated. I2C device drivers shouldn't change their
- behavior based on the underlying I2C adapter. Instead, the I2C
- adapter driver should instantiate the I2C devices and provide the
- needed platform-specific information.
-Who: Jean Delvare <khali@linux-fr.org>
-
-----------------------------
-
What: cancel_rearming_delayed_work[queue]()
When: 2.6.39
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index cd2f75b742e..f1e3ff5880a 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -353,7 +353,6 @@ struct i2c_algorithm {
*/
struct i2c_adapter {
struct module *owner;
- unsigned int id __deprecated;
unsigned int class; /* classes to allow probing for */
const struct i2c_algorithm *algo; /* the algorithm to access the bus */
void *algo_data;