From khali@linux-fr.org Sun Aug 13 14:32:44 2006 Date: Sun, 13 Aug 2006 23:32:37 +0200 From: Jean Delvare To: Greg KH Cc: Ralf Baechle Subject: i2c-algo-sibyte: Cleanups Message-Id: <20060813233237.daf9e9a6.khali@linux-fr.org> Content-Disposition: inline; filename=i2c-algo-sibyte-cleanups.patch 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 Cc: Ralf Baechle Signed-off-by: Greg Kroah-Hartman --- drivers/i2c/algos/i2c-algo-sibyte.c | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) --- gregkh-2.6.orig/drivers/i2c/algos/i2c-algo-sibyte.c +++ gregkh-2.6/drivers/i2c/algos/i2c-algo-sibyte.c @@ -119,12 +119,6 @@ static int smbus_xfer(struct i2c_adapter 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 * 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_adapte 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