From 5c929bec84d66dd199cda8d251de83c09c979df1 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Sat, 13 Oct 2007 23:56:32 +0200 Subject: [PATCH] --- yaml --- r: 68594 b: refs/heads/master c: 3be27d37c257fa5f99363f9c8e06e405cbad712e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-iop3xx.c | 8 -------- trunk/drivers/media/video/bt8xx/bttv-i2c.c | 7 ------- trunk/drivers/media/video/em28xx/em28xx-i2c.c | 10 ---------- trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 7 ------- trunk/drivers/media/video/saa7134/saa7134-i2c.c | 7 ------- trunk/drivers/media/video/usbvision/usbvision-i2c.c | 6 ------ trunk/drivers/media/video/w9968cf.c | 11 ----------- 8 files changed, 1 insertion(+), 57 deletions(-) diff --git a/[refs] b/[refs] index 30127d9bbd31..8b9e363b963b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e265cfa19c1220938de5f0291ed8d549a523de3c +refs/heads/master: 3be27d37c257fa5f99363f9c8e06e405cbad712e diff --git a/trunk/drivers/i2c/busses/i2c-iop3xx.c b/trunk/drivers/i2c/busses/i2c-iop3xx.c index ace644e21b14..c70146e4c2c0 100644 --- a/trunk/drivers/i2c/busses/i2c-iop3xx.c +++ b/trunk/drivers/i2c/busses/i2c-iop3xx.c @@ -389,13 +389,6 @@ iop3xx_i2c_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, 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, }; diff --git a/trunk/drivers/media/video/bt8xx/bttv-i2c.c b/trunk/drivers/media/video/bt8xx/bttv-i2c.c index 844f1762c45a..4d5b8035e466 100644 --- a/trunk/drivers/media/video/bt8xx/bttv-i2c.c +++ b/trunk/drivers/media/video/bt8xx/bttv-i2c.c @@ -124,12 +124,6 @@ static struct i2c_adapter bttv_i2c_adap_sw_template = { /* ----------------------------------------------------------------------- */ /* 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; @@ -278,7 +272,6 @@ static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int static struct i2c_algorithm bttv_algo = { .master_xfer = bttv_i2c_xfer, - .algo_control = algo_control, .functionality = functionality, }; diff --git a/trunk/drivers/media/video/em28xx/em28xx-i2c.c b/trunk/drivers/media/video/em28xx/em28xx-i2c.c index 54ccc6e1f92e..997d067e32e0 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-i2c.c +++ b/trunk/drivers/media/video/em28xx/em28xx-i2c.c @@ -382,15 +382,6 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len) /* ----------------------------------------------------------- */ -/* - * algo_control() - */ -static int algo_control(struct i2c_adapter *adapter, - unsigned int cmd, unsigned long arg) -{ - return 0; -} - /* * functionality() */ @@ -475,7 +466,6 @@ static int attach_inform(struct i2c_client *client) static struct i2c_algorithm em28xx_algo = { .master_xfer = em28xx_i2c_xfer, - .algo_control = algo_control, .functionality = functionality, }; diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c index 898c9d2e4cdf..c817c864e6a0 100644 --- a/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c +++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c @@ -520,12 +520,6 @@ static int pvr2_i2c_xfer(struct i2c_adapter *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; @@ -942,7 +936,6 @@ static int pvr2_i2c_detach_inform(struct i2c_client *client) static struct i2c_algorithm pvr2_i2c_algo_template = { .master_xfer = pvr2_i2c_xfer, - .algo_control = pvr2_i2c_control, .functionality = pvr2_i2c_functionality, }; diff --git a/trunk/drivers/media/video/saa7134/saa7134-i2c.c b/trunk/drivers/media/video/saa7134/saa7134-i2c.c index cc87f5855a21..6deaad1a5480 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-i2c.c +++ b/trunk/drivers/media/video/saa7134/saa7134-i2c.c @@ -314,12 +314,6 @@ static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap, /* ----------------------------------------------------------- */ -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_client *client) static struct i2c_algorithm saa7134_algo = { .master_xfer = saa7134_i2c_xfer, - .algo_control = algo_control, .functionality = functionality, }; diff --git a/trunk/drivers/media/video/usbvision/usbvision-i2c.c b/trunk/drivers/media/video/usbvision/usbvision-i2c.c index c66aef63916f..aabc42cae9c7 100644 --- a/trunk/drivers/media/video/usbvision/usbvision-i2c.c +++ b/trunk/drivers/media/video/usbvision/usbvision-i2c.c @@ -183,11 +183,6 @@ usbvision_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num) 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_adapter *adap) static struct i2c_algorithm usbvision_algo = { .master_xfer = usbvision_i2c_xfer, .smbus_xfer = NULL, - .algo_control = algo_control, .functionality = functionality, }; diff --git a/trunk/drivers/media/video/w9968cf.c b/trunk/drivers/media/video/w9968cf.c index 5a1b5f5a7d46..9e7f3e685d73 100644 --- a/trunk/drivers/media/video/w9968cf.c +++ b/trunk/drivers/media/video/w9968cf.c @@ -444,8 +444,6 @@ static int w9968cf_i2c_smbus_xfer(struct i2c_adapter*, u16 addr, 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); @@ -1543,21 +1541,12 @@ static int w9968cf_i2c_detach_inform(struct i2c_client* client) } -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, };