diff options
author | Jean Delvare <khali@linux-fr.org> | 2006-08-13 23:32:37 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-09-26 15:38:50 -0700 |
commit | 3fd39687540bd5d0501f413c91461d3b9fcbb525 (patch) | |
tree | 6adc73fab509b926d8917ce01ee6516739efbfaa /drivers/i2c | |
parent | defcb46ed4666095677c8f52904b9e328587a20d (diff) | |
download | linux-3.10-3fd39687540bd5d0501f413c91461d3b9fcbb525.tar.gz linux-3.10-3fd39687540bd5d0501f413c91461d3b9fcbb525.tar.bz2 linux-3.10-3fd39687540bd5d0501f413c91461d3b9fcbb525.zip |
i2c-algo-sibyte: Cleanups
i2c-algo-sibyte: Cleanups
* Delete empty algo_control implementation.
* Simplify i2c_sibyte_del_bus.
* Delete empty module init and cleanup functions.
* Drop out-of-date #ifdef MODULE construct.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/algos/i2c-algo-sibyte.c | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/drivers/i2c/algos/i2c-algo-sibyte.c b/drivers/i2c/algos/i2c-algo-sibyte.c index 32d41c6fac0..16d666fa16f 100644 --- a/drivers/i2c/algos/i2c-algo-sibyte.c +++ b/drivers/i2c/algos/i2c-algo-sibyte.c @@ -119,12 +119,6 @@ static int smbus_xfer(struct i2c_adapter *i2c_adap, u16 addr, return 0; } -static int algo_control(struct i2c_adapter *adapter, - unsigned int cmd, unsigned long arg) -{ - return 0; -} - static u32 bit_func(struct i2c_adapter *adap) { return (I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE | @@ -136,7 +130,6 @@ static u32 bit_func(struct i2c_adapter *adap) static struct i2c_algorithm i2c_sibyte_algo = { .smbus_xfer = smbus_xfer, - .algo_control = algo_control, /* ioctl */ .functionality = bit_func, }; @@ -179,37 +172,15 @@ int i2c_sibyte_add_bus(struct i2c_adapter *i2c_adap, int speed) int i2c_sibyte_del_bus(struct i2c_adapter *adap) { - int res; - - if ((res = i2c_del_adapter(adap)) < 0) - return res; - - return 0; -} - -int __init i2c_algo_sibyte_init (void) -{ - printk("i2c-algo-sibyte.o: i2c SiByte algorithm module\n"); - return 0; + return i2c_del_adapter(adap); } EXPORT_SYMBOL(i2c_sibyte_add_bus); EXPORT_SYMBOL(i2c_sibyte_del_bus); -#ifdef MODULE MODULE_AUTHOR("Kip Walker, Broadcom Corp."); MODULE_DESCRIPTION("SiByte I2C-Bus algorithm"); module_param(bit_scan, int, 0); MODULE_PARM_DESC(bit_scan, "Scan for active chips on the bus"); MODULE_LICENSE("GPL"); - -int init_module(void) -{ - return i2c_algo_sibyte_init(); -} - -void cleanup_module(void) -{ -} -#endif |