diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 13:44:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 13:44:40 -0700 |
| commit | ddb03448274b95bff6df2a2f1a74d7eb4be529d3 (patch) | |
| tree | bd54ec00a4c49ab359a1e7ecce85099f2eedf11d /drivers/i2c/i2c-smbus.c | |
| parent | dbf7b5915b39bfff548e4c6a3a753fc291a60e25 (diff) | |
| parent | fb604a3d58b79ef722942f664f11dee5e1f73ea4 (diff) | |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull i2c updates from Jean Delvare:
"The most important changes here are a big cleanup of the i2c-piix4
driver, cleanups and interrupt support to the i2c-i801 driver, and
support for the SCCB protocol."
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
i2c-omap: Add support for I2C_M_STOP message flag
i2c: Fall back to emulated SMBus if the operation isn't supported natively
i2c: Add SCCB support
i2c-tiny-usb: Add support for the Robofuzz OSIF USB/I2C converter
i2c-i801: Enable IRQ for byte_by_byte transactions
i2c-i801: Enable interrupts on ICH5/7/8/9/10
i2c-i801: Enable IRQ for SMBus transactions
i2c-i801: Consolidate polling
i2c-i801: Drop ENABLE_INT9
i2c-i801: Rename some SMBHSTCNT bit constants
i2c-i801: Check and return errors during byte-by-byte transfers
i2c-i801: Clear only status bits in HST_STS
i2c-i801: Refactor use of LAST_BYTE in i801_block_transaction_byte_by_byte
i2c-smbus: Use module_i2c_driver()
i2c/writing-clients: Mention module_i2c_driver()
i2c-piix4: Support AMD auxiliary SMBus controller
i2c-piix4: Separate registration and probing code
i2c-piix4: Eliminate piix4_smba global variable
i2c/busses: Use module_pci_driver
i2c: Update Guenter Roeck's e-mail address
Diffstat (limited to 'drivers/i2c/i2c-smbus.c')
| -rw-r--r-- | drivers/i2c/i2c-smbus.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/i2c/i2c-smbus.c b/drivers/i2c/i2c-smbus.c index 9836d08f7a7..df3e0bf31eb 100644 --- a/drivers/i2c/i2c-smbus.c +++ b/drivers/i2c/i2c-smbus.c @@ -245,18 +245,7 @@ int i2c_handle_smbus_alert(struct i2c_client *ara) } EXPORT_SYMBOL_GPL(i2c_handle_smbus_alert); -static int __init i2c_smbus_init(void) -{ - return i2c_add_driver(&smbalert_driver); -} - -static void __exit i2c_smbus_exit(void) -{ - i2c_del_driver(&smbalert_driver); -} - -module_init(i2c_smbus_init); -module_exit(i2c_smbus_exit); +module_i2c_driver(smbalert_driver); MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>"); MODULE_DESCRIPTION("SMBus protocol extensions support"); |