diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-28 15:28:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-28 15:28:50 -0400 |
| commit | 9c2bdac40eba639c438690b1245a020e7c2530df (patch) | |
| tree | ee3f8dd83bf64dd8bc48aebd492ef239a8b98adb /include | |
| parent | 41108eb10142e0552f2de1e4c0675b108c5f018f (diff) | |
| parent | 4329cf8613b0c7cdc020005f0e1ea7378681f1d8 (diff) | |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c: Prevent log spam on some DVB adapters
i2c: Add missing kerneldoc descriptions
i2c: Fix device_init_wakeup place
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/i2c.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 08be0d21864c..06115128047f 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
| @@ -97,7 +97,19 @@ extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client * client, | |||
| 97 | 97 | ||
| 98 | /** | 98 | /** |
| 99 | * struct i2c_driver - represent an I2C device driver | 99 | * struct i2c_driver - represent an I2C device driver |
| 100 | * @id: Unique driver ID (optional) | ||
| 100 | * @class: What kind of i2c device we instantiate (for detect) | 101 | * @class: What kind of i2c device we instantiate (for detect) |
| 102 | * @attach_adapter: Callback for bus addition (for legacy drivers) | ||
| 103 | * @detach_adapter: Callback for bus removal (for legacy drivers) | ||
| 104 | * @detach_client: Callback for device removal (for legacy drivers) | ||
| 105 | * @probe: Callback for device binding (new-style drivers) | ||
| 106 | * @remove: Callback for device unbinding (new-style drivers) | ||
| 107 | * @shutdown: Callback for device shutdown | ||
| 108 | * @suspend: Callback for device suspend | ||
| 109 | * @resume: Callback for device resume | ||
| 110 | * @command: Callback for bus-wide signaling (optional) | ||
| 111 | * @driver: Device driver model driver | ||
| 112 | * @id_table: List of I2C devices supported by this driver | ||
| 101 | * @detect: Callback for device detection | 113 | * @detect: Callback for device detection |
| 102 | * @address_data: The I2C addresses to probe, ignore or force (for detect) | 114 | * @address_data: The I2C addresses to probe, ignore or force (for detect) |
| 103 | * @clients: List of detected clients we created (for i2c-core use only) | 115 | * @clients: List of detected clients we created (for i2c-core use only) |