diff options
author | Jean Delvare <khali@linux-fr.org> | 2009-06-19 10:58:19 -0400 |
---|---|---|
committer | Jean Delvare <khali@linux-fr.org> | 2009-06-19 10:58:19 -0400 |
commit | e549c2b54dd90a056d6824b885d438b7437874f0 (patch) | |
tree | 45da005101a1587c18b41f4ad572458e08b95099 /include/linux/i2c.h | |
parent | 1e40ac12dab22d98d0178e87364cf4e36862809c (diff) |
i2c: Kill the redundant client list
We used to maintain our own per-adapter list of i2c clients, but this
is redundant with what the driver core does, and no longer needed.
Just drop the redundant list.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'include/linux/i2c.h')
-rw-r--r-- | include/linux/i2c.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 28b27282496f..5f8157610c64 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
@@ -178,7 +178,6 @@ struct i2c_driver { | |||
178 | * @driver: device's driver, hence pointer to access routines | 178 | * @driver: device's driver, hence pointer to access routines |
179 | * @dev: Driver model device node for the slave. | 179 | * @dev: Driver model device node for the slave. |
180 | * @irq: indicates the IRQ generated by this device (if any) | 180 | * @irq: indicates the IRQ generated by this device (if any) |
181 | * @list: list of active/busy clients (DEPRECATED) | ||
182 | * @detected: member of an i2c_driver.clients list | 181 | * @detected: member of an i2c_driver.clients list |
183 | * | 182 | * |
184 | * An i2c_client identifies a single device (i.e. chip) connected to an | 183 | * An i2c_client identifies a single device (i.e. chip) connected to an |
@@ -195,7 +194,6 @@ struct i2c_client { | |||
195 | struct i2c_driver *driver; /* and our access routines */ | 194 | struct i2c_driver *driver; /* and our access routines */ |
196 | struct device dev; /* the device structure */ | 195 | struct device dev; /* the device structure */ |
197 | int irq; /* irq issued by device */ | 196 | int irq; /* irq issued by device */ |
198 | struct list_head list; /* DEPRECATED */ | ||
199 | struct list_head detected; | 197 | struct list_head detected; |
200 | }; | 198 | }; |
201 | #define to_i2c_client(d) container_of(d, struct i2c_client, dev) | 199 | #define to_i2c_client(d) container_of(d, struct i2c_client, dev) |
@@ -339,14 +337,12 @@ struct i2c_adapter { | |||
339 | /* data fields that are valid for all devices */ | 337 | /* data fields that are valid for all devices */ |
340 | u8 level; /* nesting level for lockdep */ | 338 | u8 level; /* nesting level for lockdep */ |
341 | struct mutex bus_lock; | 339 | struct mutex bus_lock; |
342 | struct mutex clist_lock; | ||
343 | 340 | ||
344 | int timeout; /* in jiffies */ | 341 | int timeout; /* in jiffies */ |
345 | int retries; | 342 | int retries; |
346 | struct device dev; /* the adapter device */ | 343 | struct device dev; /* the adapter device */ |
347 | 344 | ||
348 | int nr; | 345 | int nr; |
349 | struct list_head clients; /* DEPRECATED */ | ||
350 | char name[48]; | 346 | char name[48]; |
351 | struct completion dev_released; | 347 | struct completion dev_released; |
352 | }; | 348 | }; |