From: David Brownell Subject: i2c: remove NOP i2c_algorithm.algo_control() methods This removes NOP implementations of i2c_algorithm.algo_control. With this change, there are no implementations of this hook in the kernel.org tree ... that hook seems about ripe to remove. Signed-off-by: David Brownell Signed-off-by: Jean Delvare --- drivers/i2c/busses/i2c-iop3xx.c | 8 -------- drivers/media/video/bt8xx/bttv-i2c.c | 7 ------- drivers/media/video/em28xx/em28xx-i2c.c | 10 ---------- drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 7 ------- drivers/media/video/saa7134/saa7134-i2c.c | 7 ------- drivers/media/video/usbvision/usbvision-i2c.c | 6 ------ drivers/media/video/w9968cf.c | 11 ----------- 7 files changed, 56 deletions(-) --- linux-2.6.23-rc9.orig/drivers/i2c/busses/i2c-iop3xx.c 2007-08-28 09:59:45.000000000 +0200 +++ linux-2.6.23-rc9/drivers/i2c/busses/i2c-iop3xx.c 2007-10-03 23:08:49.000000000 +0200 @@ -389,13 +389,6 @@ iop3xx_i2c_master_xfer(struct i2c_adapte return im; } -static int -iop3xx_i2c_algo_control(struct i2c_adapter *adapter, unsigned int cmd, - unsigned long arg) -{ - return 0; -} - static u32 iop3xx_i2c_func(struct i2c_adapter *adap) { @@ -404,7 +397,6 @@ iop3xx_i2c_func(struct i2c_adapter *adap static const struct i2c_algorithm iop3xx_i2c_algo = { .master_xfer = iop3xx_i2c_master_xfer, - .algo_control = iop3xx_i2c_algo_control, .functionality = iop3xx_i2c_func, }; --- linux-2.6.23-rc9.orig/drivers/media/video/w9968cf.c 2007-07-09 14:48:57.000000000 +0200 +++ linux-2.6.23-rc9/drivers/media/video/w9968cf.c 2007-10-03 23:08:49.000000000 +0200 @@ -445,8 +445,6 @@ static int w9968cf_i2c_smbus_xfer(struct static u32 w9968cf_i2c_func(struct i2c_adapter*); static int w9968cf_i2c_attach_inform(struct i2c_client*); static int w9968cf_i2c_detach_inform(struct i2c_client*); -static int w9968cf_i2c_control(struct i2c_adapter*, unsigned int cmd, - unsigned long arg); /* Memory management */ static void* rvmalloc(unsigned long size); @@ -1544,21 +1542,12 @@ static int w9968cf_i2c_detach_inform(str } -static int -w9968cf_i2c_control(struct i2c_adapter* adapter, unsigned int cmd, - unsigned long arg) -{ - return 0; -} - - static int w9968cf_i2c_init(struct w9968cf_device* cam) { int err = 0; static struct i2c_algorithm algo = { .smbus_xfer = w9968cf_i2c_smbus_xfer, - .algo_control = w9968cf_i2c_control, .functionality = w9968cf_i2c_func, }; --- linux-2.6.23-rc9.orig/drivers/media/video/bt8xx/bttv-i2c.c 2007-08-16 15:13:26.000000000 +0200 +++ linux-2.6.23-rc9/drivers/media/video/bt8xx/bttv-i2c.c 2007-10-03 23:08:49.000000000 +0200 @@ -125,12 +125,6 @@ static struct i2c_adapter bttv_i2c_adap_ /* ----------------------------------------------------------------------- */ /* I2C functions - hardware i2c */ -static int algo_control(struct i2c_adapter *adapter, - unsigned int cmd, unsigned long arg) -{ - return 0; -} - static u32 functionality(struct i2c_adapter *adap) { return I2C_FUNC_SMBUS_EMUL; @@ -279,7 +273,6 @@ static int bttv_i2c_xfer(struct i2c_adap static struct i2c_algorithm bttv_algo = { .master_xfer = bttv_i2c_xfer, - .algo_control = algo_control, .functionality = functionality, }; --- linux-2.6.23-rc9.orig/drivers/media/video/em28xx/em28xx-i2c.c 2007-07-09 14:49:47.000000000 +0200 +++ linux-2.6.23-rc9/drivers/media/video/em28xx/em28xx-i2c.c 2007-10-03 23:08:49.000000000 +0200 @@ -383,15 +383,6 @@ static int em28xx_i2c_eeprom(struct em28 /* ----------------------------------------------------------- */ /* - * algo_control() - */ -static int algo_control(struct i2c_adapter *adapter, - unsigned int cmd, unsigned long arg) -{ - return 0; -} - -/* * functionality() */ static u32 functionality(struct i2c_adapter *adap) @@ -475,7 +466,6 @@ static int attach_inform(struct i2c_clie static struct i2c_algorithm em28xx_algo = { .master_xfer = em28xx_i2c_xfer, - .algo_control = algo_control, .functionality = functionality, }; --- linux-2.6.23-rc9.orig/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c 2007-10-03 13:08:26.000000000 +0200 +++ linux-2.6.23-rc9/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c 2007-10-03 23:08:49.000000000 +0200 @@ -520,12 +520,6 @@ static int pvr2_i2c_xfer(struct i2c_adap return ret; } -static int pvr2_i2c_control(struct i2c_adapter *adapter, - unsigned int cmd, unsigned long arg) -{ - return 0; -} - static u32 pvr2_i2c_functionality(struct i2c_adapter *adap) { return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C; @@ -961,7 +955,6 @@ static int pvr2_i2c_detach_inform(struct static struct i2c_algorithm pvr2_i2c_algo_template = { .master_xfer = pvr2_i2c_xfer, - .algo_control = pvr2_i2c_control, .functionality = pvr2_i2c_functionality, }; --- linux-2.6.23-rc9.orig/drivers/media/video/saa7134/saa7134-i2c.c 2007-10-03 13:08:26.000000000 +0200 +++ linux-2.6.23-rc9/drivers/media/video/saa7134/saa7134-i2c.c 2007-10-03 23:08:49.000000000 +0200 @@ -314,12 +314,6 @@ static int saa7134_i2c_xfer(struct i2c_a /* ----------------------------------------------------------- */ -static int algo_control(struct i2c_adapter *adapter, - unsigned int cmd, unsigned long arg) -{ - return 0; -} - static u32 functionality(struct i2c_adapter *adap) { return I2C_FUNC_SMBUS_EMUL; @@ -387,7 +381,6 @@ static int attach_inform(struct i2c_clie static struct i2c_algorithm saa7134_algo = { .master_xfer = saa7134_i2c_xfer, - .algo_control = algo_control, .functionality = functionality, }; --- linux-2.6.23-rc9.orig/drivers/media/video/usbvision/usbvision-i2c.c 2007-10-03 13:08:26.000000000 +0200 +++ linux-2.6.23-rc9/drivers/media/video/usbvision/usbvision-i2c.c 2007-10-03 23:08:49.000000000 +0200 @@ -183,11 +183,6 @@ usbvision_i2c_xfer(struct i2c_adapter *i return num; } -static int algo_control(struct i2c_adapter *adapter, unsigned int cmd, unsigned long arg) -{ - return 0; -} - static u32 functionality(struct i2c_adapter *adap) { return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR; @@ -199,7 +194,6 @@ static u32 functionality(struct i2c_adap static struct i2c_algorithm usbvision_algo = { .master_xfer = usbvision_i2c_xfer, .smbus_xfer = NULL, - .algo_control = algo_control, .functionality = functionality, };