diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/common/saa7146_i2c.c | 1 | ||||
-rw-r--r-- | drivers/media/dvb/b2c2/flexcop-i2c.c | 1 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/cxusb.c | 1 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/dibusb-common.c | 1 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/digitv.c | 1 | ||||
-rw-r--r-- | drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 1 | ||||
-rw-r--r-- | drivers/media/video/bttv-i2c.c | 1 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-i2c.c | 1 |
8 files changed, 0 insertions, 8 deletions
diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c index dceda86cd99d..e413ee7f267a 100644 --- a/drivers/media/common/saa7146_i2c.c +++ b/drivers/media/common/saa7146_i2c.c | |||
@@ -387,7 +387,6 @@ static int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, in | |||
387 | 387 | ||
388 | /* exported algorithm data */ | 388 | /* exported algorithm data */ |
389 | static struct i2c_algorithm saa7146_algo = { | 389 | static struct i2c_algorithm saa7146_algo = { |
390 | .id = I2C_ALGO_SAA7146, | ||
391 | .master_xfer = saa7146_i2c_xfer, | 390 | .master_xfer = saa7146_i2c_xfer, |
392 | .functionality = saa7146_i2c_func, | 391 | .functionality = saa7146_i2c_func, |
393 | }; | 392 | }; |
diff --git a/drivers/media/dvb/b2c2/flexcop-i2c.c b/drivers/media/dvb/b2c2/flexcop-i2c.c index 75f2c94f3190..848910ff3c9c 100644 --- a/drivers/media/dvb/b2c2/flexcop-i2c.c +++ b/drivers/media/dvb/b2c2/flexcop-i2c.c | |||
@@ -172,7 +172,6 @@ static u32 flexcop_i2c_func(struct i2c_adapter *adapter) | |||
172 | } | 172 | } |
173 | 173 | ||
174 | static struct i2c_algorithm flexcop_algo = { | 174 | static struct i2c_algorithm flexcop_algo = { |
175 | .id = I2C_ALGO_BIT, | ||
176 | .master_xfer = flexcop_master_xfer, | 175 | .master_xfer = flexcop_master_xfer, |
177 | .functionality = flexcop_i2c_func, | 176 | .functionality = flexcop_i2c_func, |
178 | }; | 177 | }; |
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c index 36fe602f85b6..9e96a188f1e9 100644 --- a/drivers/media/dvb/dvb-usb/cxusb.c +++ b/drivers/media/dvb/dvb-usb/cxusb.c | |||
@@ -141,7 +141,6 @@ static u32 cxusb_i2c_func(struct i2c_adapter *adapter) | |||
141 | } | 141 | } |
142 | 142 | ||
143 | static struct i2c_algorithm cxusb_i2c_algo = { | 143 | static struct i2c_algorithm cxusb_i2c_algo = { |
144 | .id = I2C_ALGO_BIT, | ||
145 | .master_xfer = cxusb_i2c_xfer, | 144 | .master_xfer = cxusb_i2c_xfer, |
146 | .functionality = cxusb_i2c_func, | 145 | .functionality = cxusb_i2c_func, |
147 | }; | 146 | }; |
diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c index c3a639520e8a..00b946419b40 100644 --- a/drivers/media/dvb/dvb-usb/dibusb-common.c +++ b/drivers/media/dvb/dvb-usb/dibusb-common.c | |||
@@ -156,7 +156,6 @@ static u32 dibusb_i2c_func(struct i2c_adapter *adapter) | |||
156 | } | 156 | } |
157 | 157 | ||
158 | struct i2c_algorithm dibusb_i2c_algo = { | 158 | struct i2c_algorithm dibusb_i2c_algo = { |
159 | .id = I2C_ALGO_BIT, | ||
160 | .master_xfer = dibusb_i2c_xfer, | 159 | .master_xfer = dibusb_i2c_xfer, |
161 | .functionality = dibusb_i2c_func, | 160 | .functionality = dibusb_i2c_func, |
162 | }; | 161 | }; |
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c index 6e4e1e9158e3..f70e0be0920a 100644 --- a/drivers/media/dvb/dvb-usb/digitv.c +++ b/drivers/media/dvb/dvb-usb/digitv.c | |||
@@ -77,7 +77,6 @@ static u32 digitv_i2c_func(struct i2c_adapter *adapter) | |||
77 | } | 77 | } |
78 | 78 | ||
79 | static struct i2c_algorithm digitv_i2c_algo = { | 79 | static struct i2c_algorithm digitv_i2c_algo = { |
80 | .id = I2C_ALGO_BIT, | ||
81 | .master_xfer = digitv_i2c_xfer, | 80 | .master_xfer = digitv_i2c_xfer, |
82 | .functionality = digitv_i2c_func, | 81 | .functionality = digitv_i2c_func, |
83 | }; | 82 | }; |
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c index c337ee546bac..11afec52f31f 100644 --- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c +++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | |||
@@ -1472,7 +1472,6 @@ static void frontend_init(struct ttusb* ttusb) | |||
1472 | 1472 | ||
1473 | 1473 | ||
1474 | static struct i2c_algorithm ttusb_dec_algo = { | 1474 | static struct i2c_algorithm ttusb_dec_algo = { |
1475 | .id = I2C_ALGO_BIT, | ||
1476 | .master_xfer = master_xfer, | 1475 | .master_xfer = master_xfer, |
1477 | .functionality = functionality, | 1476 | .functionality = functionality, |
1478 | }; | 1477 | }; |
diff --git a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c index dbc96fce7501..82beb5a8a59c 100644 --- a/drivers/media/video/bttv-i2c.c +++ b/drivers/media/video/bttv-i2c.c | |||
@@ -270,7 +270,6 @@ static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int | |||
270 | } | 270 | } |
271 | 271 | ||
272 | static struct i2c_algorithm bttv_algo = { | 272 | static struct i2c_algorithm bttv_algo = { |
273 | .id = I2C_ALGO_BIT | I2C_HW_B_BT848 /* FIXME */, | ||
274 | .master_xfer = bttv_i2c_xfer, | 273 | .master_xfer = bttv_i2c_xfer, |
275 | .algo_control = algo_control, | 274 | .algo_control = algo_control, |
276 | .functionality = functionality, | 275 | .functionality = functionality, |
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c index 1a53c7eb104a..0bb1073d94bd 100644 --- a/drivers/media/video/saa7134/saa7134-i2c.c +++ b/drivers/media/video/saa7134/saa7134-i2c.c | |||
@@ -370,7 +370,6 @@ static int attach_inform(struct i2c_client *client) | |||
370 | } | 370 | } |
371 | 371 | ||
372 | static struct i2c_algorithm saa7134_algo = { | 372 | static struct i2c_algorithm saa7134_algo = { |
373 | .id = I2C_ALGO_SAA7134, | ||
374 | .master_xfer = saa7134_i2c_xfer, | 373 | .master_xfer = saa7134_i2c_xfer, |
375 | .algo_control = algo_control, | 374 | .algo_control = algo_control, |
376 | .functionality = functionality, | 375 | .functionality = functionality, |