aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/i2c/algos/i2c-algo-bit.c1
-rw-r--r--drivers/i2c/algos/i2c-algo-ite.c1
-rw-r--r--drivers/i2c/algos/i2c-algo-pca.c1
-rw-r--r--drivers/i2c/algos/i2c-algo-pcf.c1
-rw-r--r--drivers/i2c/algos/i2c-algo-sgi.c1
-rw-r--r--drivers/i2c/algos/i2c-algo-sibyte.c1
-rw-r--r--drivers/i2c/busses/i2c-ali1535.c1
-rw-r--r--drivers/i2c/busses/i2c-ali1563.c1
-rw-r--r--drivers/i2c/busses/i2c-ali15x3.c1
-rw-r--r--drivers/i2c/busses/i2c-amd756.c1
-rw-r--r--drivers/i2c/busses/i2c-amd8111.c1
-rw-r--r--drivers/i2c/busses/i2c-au1550.c1
-rw-r--r--drivers/i2c/busses/i2c-i801.c1
-rw-r--r--drivers/i2c/busses/i2c-ibm_iic.c1
-rw-r--r--drivers/i2c/busses/i2c-iop3xx.c1
-rw-r--r--drivers/i2c/busses/i2c-isa.c1
-rw-r--r--drivers/i2c/busses/i2c-keywest.c1
-rw-r--r--drivers/i2c/busses/i2c-mpc.c1
-rw-r--r--drivers/i2c/busses/i2c-mv64xxx.c1
-rw-r--r--drivers/i2c/busses/i2c-nforce2.c1
-rw-r--r--drivers/i2c/busses/i2c-piix4.c1
-rw-r--r--drivers/i2c/busses/i2c-sis5595.c1
-rw-r--r--drivers/i2c/busses/i2c-sis630.c1
-rw-r--r--drivers/i2c/busses/i2c-sis96x.c1
-rw-r--r--drivers/i2c/busses/i2c-stub.c1
-rw-r--r--drivers/i2c/busses/i2c-viapro.c1
-rw-r--r--drivers/i2c/busses/scx200_acb.c1
-rw-r--r--drivers/media/common/saa7146_i2c.c1
-rw-r--r--drivers/media/dvb/b2c2/flexcop-i2c.c1
-rw-r--r--drivers/media/dvb/dvb-usb/cxusb.c1
-rw-r--r--drivers/media/dvb/dvb-usb/dibusb-common.c1
-rw-r--r--drivers/media/dvb/dvb-usb/digitv.c1
-rw-r--r--drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c1
-rw-r--r--drivers/media/video/bttv-i2c.c1
-rw-r--r--drivers/media/video/saa7134/saa7134-i2c.c1
-rw-r--r--drivers/usb/media/w9968cf.c1
-rw-r--r--include/linux/i2c.h2
37 files changed, 0 insertions, 38 deletions
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index b8767382bbac..6060b10ab0ce 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -519,7 +519,6 @@ static u32 bit_func(struct i2c_adapter *adap)
519/* -----exported algorithm data: ------------------------------------- */ 519/* -----exported algorithm data: ------------------------------------- */
520 520
521static struct i2c_algorithm i2c_bit_algo = { 521static struct i2c_algorithm i2c_bit_algo = {
522 .id = I2C_ALGO_BIT,
523 .master_xfer = bit_xfer, 522 .master_xfer = bit_xfer,
524 .functionality = bit_func, 523 .functionality = bit_func,
525}; 524};
diff --git a/drivers/i2c/algos/i2c-algo-ite.c b/drivers/i2c/algos/i2c-algo-ite.c
index 6cb02f685db3..b460e57216e1 100644
--- a/drivers/i2c/algos/i2c-algo-ite.c
+++ b/drivers/i2c/algos/i2c-algo-ite.c
@@ -713,7 +713,6 @@ static u32 iic_func(struct i2c_adapter *adap)
713/* -----exported algorithm data: ------------------------------------- */ 713/* -----exported algorithm data: ------------------------------------- */
714 714
715static struct i2c_algorithm iic_algo = { 715static struct i2c_algorithm iic_algo = {
716 .id = I2C_ALGO_IIC,
717 .master_xfer = iic_xfer, 716 .master_xfer = iic_xfer,
718 .algo_control = algo_control, /* ioctl */ 717 .algo_control = algo_control, /* ioctl */
719 .functionality = iic_func, 718 .functionality = iic_func,
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
index 79b3c2edcf08..be2c8abc6682 100644
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -356,7 +356,6 @@ static int pca_init(struct i2c_algo_pca_data *adap)
356} 356}
357 357
358static struct i2c_algorithm pca_algo = { 358static struct i2c_algorithm pca_algo = {
359 .id = I2C_ALGO_PCA,
360 .master_xfer = pca_xfer, 359 .master_xfer = pca_xfer,
361 .functionality = pca_func, 360 .functionality = pca_func,
362}; 361};
diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c
index fbc0b87fe070..95f023ad8c62 100644
--- a/drivers/i2c/algos/i2c-algo-pcf.c
+++ b/drivers/i2c/algos/i2c-algo-pcf.c
@@ -459,7 +459,6 @@ static u32 pcf_func(struct i2c_adapter *adap)
459/* -----exported algorithm data: ------------------------------------- */ 459/* -----exported algorithm data: ------------------------------------- */
460 460
461static struct i2c_algorithm pcf_algo = { 461static struct i2c_algorithm pcf_algo = {
462 .id = I2C_ALGO_PCF,
463 .master_xfer = pcf_xfer, 462 .master_xfer = pcf_xfer,
464 .functionality = pcf_func, 463 .functionality = pcf_func,
465}; 464};
diff --git a/drivers/i2c/algos/i2c-algo-sgi.c b/drivers/i2c/algos/i2c-algo-sgi.c
index 8863a671d977..142505105d6f 100644
--- a/drivers/i2c/algos/i2c-algo-sgi.c
+++ b/drivers/i2c/algos/i2c-algo-sgi.c
@@ -158,7 +158,6 @@ static u32 sgi_func(struct i2c_adapter *adap)
158} 158}
159 159
160static struct i2c_algorithm sgi_algo = { 160static struct i2c_algorithm sgi_algo = {
161 .id = I2C_ALGO_SGI,
162 .master_xfer = sgi_xfer, 161 .master_xfer = sgi_xfer,
163 .functionality = sgi_func, 162 .functionality = sgi_func,
164}; 163};
diff --git a/drivers/i2c/algos/i2c-algo-sibyte.c b/drivers/i2c/algos/i2c-algo-sibyte.c
index 6cda0a6332d9..c01108ae7b69 100644
--- a/drivers/i2c/algos/i2c-algo-sibyte.c
+++ b/drivers/i2c/algos/i2c-algo-sibyte.c
@@ -135,7 +135,6 @@ static u32 bit_func(struct i2c_adapter *adap)
135/* -----exported algorithm data: ------------------------------------- */ 135/* -----exported algorithm data: ------------------------------------- */
136 136
137static struct i2c_algorithm i2c_sibyte_algo = { 137static struct i2c_algorithm i2c_sibyte_algo = {
138 .id = I2C_ALGO_SIBYTE,
139 .smbus_xfer = smbus_xfer, 138 .smbus_xfer = smbus_xfer,
140 .algo_control = algo_control, /* ioctl */ 139 .algo_control = algo_control, /* ioctl */
141 .functionality = bit_func, 140 .functionality = bit_func,
diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c
index d7e05a1a5125..f021acd2674e 100644
--- a/drivers/i2c/busses/i2c-ali1535.c
+++ b/drivers/i2c/busses/i2c-ali1535.c
@@ -472,7 +472,6 @@ static u32 ali1535_func(struct i2c_adapter *adapter)
472} 472}
473 473
474static struct i2c_algorithm smbus_algorithm = { 474static struct i2c_algorithm smbus_algorithm = {
475 .id = I2C_ALGO_SMBUS,
476 .smbus_xfer = ali1535_access, 475 .smbus_xfer = ali1535_access,
477 .functionality = ali1535_func, 476 .functionality = ali1535_func,
478}; 477};
diff --git a/drivers/i2c/busses/i2c-ali1563.c b/drivers/i2c/busses/i2c-ali1563.c
index 48f85e53d7d6..86947504aea1 100644
--- a/drivers/i2c/busses/i2c-ali1563.c
+++ b/drivers/i2c/busses/i2c-ali1563.c
@@ -366,7 +366,6 @@ static void ali1563_shutdown(struct pci_dev *dev)
366} 366}
367 367
368static struct i2c_algorithm ali1563_algorithm = { 368static struct i2c_algorithm ali1563_algorithm = {
369 .id = I2C_ALGO_SMBUS,
370 .smbus_xfer = ali1563_access, 369 .smbus_xfer = ali1563_access,
371 .functionality = ali1563_func, 370 .functionality = ali1563_func,
372}; 371};
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c
index 523f0129e4cd..b3f50bff39a0 100644
--- a/drivers/i2c/busses/i2c-ali15x3.c
+++ b/drivers/i2c/busses/i2c-ali15x3.c
@@ -462,7 +462,6 @@ static u32 ali15x3_func(struct i2c_adapter *adapter)
462} 462}
463 463
464static struct i2c_algorithm smbus_algorithm = { 464static struct i2c_algorithm smbus_algorithm = {
465 .id = I2C_ALGO_SMBUS,
466 .smbus_xfer = ali15x3_access, 465 .smbus_xfer = ali15x3_access,
467 .functionality = ali15x3_func, 466 .functionality = ali15x3_func,
468}; 467};
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c
index 7cf33325ac14..6ad0603384b8 100644
--- a/drivers/i2c/busses/i2c-amd756.c
+++ b/drivers/i2c/busses/i2c-amd756.c
@@ -295,7 +295,6 @@ static u32 amd756_func(struct i2c_adapter *adapter)
295} 295}
296 296
297static struct i2c_algorithm smbus_algorithm = { 297static struct i2c_algorithm smbus_algorithm = {
298 .id = I2C_ALGO_SMBUS,
299 .smbus_xfer = amd756_access, 298 .smbus_xfer = amd756_access,
300 .functionality = amd756_func, 299 .functionality = amd756_func,
301}; 300};
diff --git a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c
index 3b98d3b40042..45ea24ba14d5 100644
--- a/drivers/i2c/busses/i2c-amd8111.c
+++ b/drivers/i2c/busses/i2c-amd8111.c
@@ -323,7 +323,6 @@ static u32 amd8111_func(struct i2c_adapter *adapter)
323} 323}
324 324
325static struct i2c_algorithm smbus_algorithm = { 325static struct i2c_algorithm smbus_algorithm = {
326 .id = I2C_ALGO_SMBUS,
327 .smbus_xfer = amd8111_access, 326 .smbus_xfer = amd8111_access,
328 .functionality = amd8111_func, 327 .functionality = amd8111_func,
329}; 328};
diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c
index 41fff3531aee..d06edce03bf4 100644
--- a/drivers/i2c/busses/i2c-au1550.c
+++ b/drivers/i2c/busses/i2c-au1550.c
@@ -283,7 +283,6 @@ au1550_func(struct i2c_adapter *adap)
283} 283}
284 284
285static struct i2c_algorithm au1550_algo = { 285static struct i2c_algorithm au1550_algo = {
286 .id = I2C_ALGO_AU1550,
287 .master_xfer = au1550_xfer, 286 .master_xfer = au1550_xfer,
288 .functionality = au1550_func, 287 .functionality = au1550_func,
289}; 288};
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index b916317b76a6..709beab76609 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -535,7 +535,6 @@ static u32 i801_func(struct i2c_adapter *adapter)
535} 535}
536 536
537static struct i2c_algorithm smbus_algorithm = { 537static struct i2c_algorithm smbus_algorithm = {
538 .id = I2C_ALGO_SMBUS,
539 .smbus_xfer = i801_access, 538 .smbus_xfer = i801_access,
540 .functionality = i801_func, 539 .functionality = i801_func,
541}; 540};
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index ade9b14e6840..f42ab909eb78 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -627,7 +627,6 @@ static u32 iic_func(struct i2c_adapter *adap)
627} 627}
628 628
629static struct i2c_algorithm iic_algo = { 629static struct i2c_algorithm iic_algo = {
630 .id = I2C_ALGO_OCP,
631 .master_xfer = iic_xfer, 630 .master_xfer = iic_xfer,
632 .functionality = iic_func 631 .functionality = iic_func
633}; 632};
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c
index c763039638d9..7bd9102db701 100644
--- a/drivers/i2c/busses/i2c-iop3xx.c
+++ b/drivers/i2c/busses/i2c-iop3xx.c
@@ -399,7 +399,6 @@ iop3xx_i2c_func(struct i2c_adapter *adap)
399} 399}
400 400
401static struct i2c_algorithm iop3xx_i2c_algo = { 401static struct i2c_algorithm iop3xx_i2c_algo = {
402 .id = I2C_ALGO_IOP3XX,
403 .master_xfer = iop3xx_i2c_master_xfer, 402 .master_xfer = iop3xx_i2c_master_xfer,
404 .algo_control = iop3xx_i2c_algo_control, 403 .algo_control = iop3xx_i2c_algo_control,
405 .functionality = iop3xx_i2c_func, 404 .functionality = iop3xx_i2c_func,
diff --git a/drivers/i2c/busses/i2c-isa.c b/drivers/i2c/busses/i2c-isa.c
index dc666d7cf45a..baae5dbc198e 100644
--- a/drivers/i2c/busses/i2c-isa.c
+++ b/drivers/i2c/busses/i2c-isa.c
@@ -43,7 +43,6 @@ static u32 isa_func(struct i2c_adapter *adapter);
43 43
44/* This is the actual algorithm we define */ 44/* This is the actual algorithm we define */
45static struct i2c_algorithm isa_algorithm = { 45static struct i2c_algorithm isa_algorithm = {
46 .id = I2C_ALGO_ISA,
47 .functionality = isa_func, 46 .functionality = isa_func,
48}; 47};
49 48
diff --git a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c
index 2937f115abf1..5254d2db282c 100644
--- a/drivers/i2c/busses/i2c-keywest.c
+++ b/drivers/i2c/busses/i2c-keywest.c
@@ -498,7 +498,6 @@ keywest_func(struct i2c_adapter * adapter)
498 498
499/* For now, we only handle combined mode (smbus) */ 499/* For now, we only handle combined mode (smbus) */
500static struct i2c_algorithm keywest_algorithm = { 500static struct i2c_algorithm keywest_algorithm = {
501 .id = I2C_ALGO_SMBUS,
502 .smbus_xfer = keywest_smbus_xfer, 501 .smbus_xfer = keywest_smbus_xfer,
503 .master_xfer = keywest_xfer, 502 .master_xfer = keywest_xfer,
504 .functionality = keywest_func, 503 .functionality = keywest_func,
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index ae988cc8cb48..70c5ffaee6a3 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -272,7 +272,6 @@ static u32 mpc_functionality(struct i2c_adapter *adap)
272} 272}
273 273
274static struct i2c_algorithm mpc_algo = { 274static struct i2c_algorithm mpc_algo = {
275 .id = I2C_ALGO_MPC107,
276 .master_xfer = mpc_xfer, 275 .master_xfer = mpc_xfer,
277 .functionality = mpc_functionality, 276 .functionality = mpc_functionality,
278}; 277};
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index f5927c68784c..6e5dd4949237 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -433,7 +433,6 @@ mv64xxx_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
433} 433}
434 434
435static struct i2c_algorithm mv64xxx_i2c_algo = { 435static struct i2c_algorithm mv64xxx_i2c_algo = {
436 .id = I2C_ALGO_MV64XXX,
437 .master_xfer = mv64xxx_i2c_xfer, 436 .master_xfer = mv64xxx_i2c_xfer,
438 .functionality = mv64xxx_i2c_functionality, 437 .functionality = mv64xxx_i2c_functionality,
439}; 438};
diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c
index 44b6dfdd3832..e0b7a913431e 100644
--- a/drivers/i2c/busses/i2c-nforce2.c
+++ b/drivers/i2c/busses/i2c-nforce2.c
@@ -110,7 +110,6 @@ static u32 nforce2_func(struct i2c_adapter *adapter);
110 110
111 111
112static struct i2c_algorithm smbus_algorithm = { 112static struct i2c_algorithm smbus_algorithm = {
113 .id = I2C_ALGO_SMBUS,
114 .smbus_xfer = nforce2_access, 113 .smbus_xfer = nforce2_access,
115 .functionality = nforce2_func, 114 .functionality = nforce2_func,
116}; 115};
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 976df581e853..6d48a4da7bed 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -399,7 +399,6 @@ static u32 piix4_func(struct i2c_adapter *adapter)
399} 399}
400 400
401static struct i2c_algorithm smbus_algorithm = { 401static struct i2c_algorithm smbus_algorithm = {
402 .id = I2C_ALGO_SMBUS,
403 .smbus_xfer = piix4_access, 402 .smbus_xfer = piix4_access,
404 .functionality = piix4_func, 403 .functionality = piix4_func,
405}; 404};
diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c
index 0308ed87e2b9..080318d6f54b 100644
--- a/drivers/i2c/busses/i2c-sis5595.c
+++ b/drivers/i2c/busses/i2c-sis5595.c
@@ -357,7 +357,6 @@ static u32 sis5595_func(struct i2c_adapter *adapter)
357} 357}
358 358
359static struct i2c_algorithm smbus_algorithm = { 359static struct i2c_algorithm smbus_algorithm = {
360 .id = I2C_ALGO_SMBUS,
361 .smbus_xfer = sis5595_access, 360 .smbus_xfer = sis5595_access,
362 .functionality = sis5595_func, 361 .functionality = sis5595_func,
363}; 362};
diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c
index 8708f9044023..86f0f448fa0b 100644
--- a/drivers/i2c/busses/i2c-sis630.c
+++ b/drivers/i2c/busses/i2c-sis630.c
@@ -448,7 +448,6 @@ exit:
448 448
449 449
450static struct i2c_algorithm smbus_algorithm = { 450static struct i2c_algorithm smbus_algorithm = {
451 .id = I2C_ALGO_SMBUS,
452 .smbus_xfer = sis630_access, 451 .smbus_xfer = sis630_access,
453 .functionality = sis630_func, 452 .functionality = sis630_func,
454}; 453};
diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c
index 6e7202ed3265..ead2ff3cf60e 100644
--- a/drivers/i2c/busses/i2c-sis96x.c
+++ b/drivers/i2c/busses/i2c-sis96x.c
@@ -249,7 +249,6 @@ static u32 sis96x_func(struct i2c_adapter *adapter)
249} 249}
250 250
251static struct i2c_algorithm smbus_algorithm = { 251static struct i2c_algorithm smbus_algorithm = {
252 .id = I2C_ALGO_SMBUS,
253 .smbus_xfer = sis96x_access, 252 .smbus_xfer = sis96x_access,
254 .functionality = sis96x_func, 253 .functionality = sis96x_func,
255}; 254};
diff --git a/drivers/i2c/busses/i2c-stub.c b/drivers/i2c/busses/i2c-stub.c
index d7203207754f..73f481e93a36 100644
--- a/drivers/i2c/busses/i2c-stub.c
+++ b/drivers/i2c/busses/i2c-stub.c
@@ -109,7 +109,6 @@ static u32 stub_func(struct i2c_adapter *adapter)
109} 109}
110 110
111static struct i2c_algorithm smbus_algorithm = { 111static struct i2c_algorithm smbus_algorithm = {
112 .id = I2C_ALGO_SMBUS,
113 .functionality = stub_func, 112 .functionality = stub_func,
114 .smbus_xfer = stub_xfer, 113 .smbus_xfer = stub_xfer,
115}; 114};
diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c
index 608ad525e7e1..99d209e0485a 100644
--- a/drivers/i2c/busses/i2c-viapro.c
+++ b/drivers/i2c/busses/i2c-viapro.c
@@ -286,7 +286,6 @@ static u32 vt596_func(struct i2c_adapter *adapter)
286} 286}
287 287
288static struct i2c_algorithm smbus_algorithm = { 288static struct i2c_algorithm smbus_algorithm = {
289 .id = I2C_ALGO_SMBUS,
290 .smbus_xfer = vt596_access, 289 .smbus_xfer = vt596_access,
291 .functionality = vt596_func, 290 .functionality = vt596_func,
292}; 291};
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
index b695233d5455..46b9a7594c99 100644
--- a/drivers/i2c/busses/scx200_acb.c
+++ b/drivers/i2c/busses/scx200_acb.c
@@ -395,7 +395,6 @@ static u32 scx200_acb_func(struct i2c_adapter *adapter)
395 395
396/* For now, we only handle combined mode (smbus) */ 396/* For now, we only handle combined mode (smbus) */
397static struct i2c_algorithm scx200_acb_algorithm = { 397static struct i2c_algorithm scx200_acb_algorithm = {
398 .id = I2C_ALGO_SMBUS,
399 .smbus_xfer = scx200_acb_smbus_xfer, 398 .smbus_xfer = scx200_acb_smbus_xfer,
400 .functionality = scx200_acb_func, 399 .functionality = scx200_acb_func,
401}; 400};
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 */
389static struct i2c_algorithm saa7146_algo = { 389static 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
174static struct i2c_algorithm flexcop_algo = { 174static 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
143static struct i2c_algorithm cxusb_i2c_algo = { 143static 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
158struct i2c_algorithm dibusb_i2c_algo = { 158struct 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
79static struct i2c_algorithm digitv_i2c_algo = { 79static 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
1474static struct i2c_algorithm ttusb_dec_algo = { 1474static 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
272static struct i2c_algorithm bttv_algo = { 272static 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
372static struct i2c_algorithm saa7134_algo = { 372static 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,
diff --git a/drivers/usb/media/w9968cf.c b/drivers/usb/media/w9968cf.c
index ad1d6777e226..908cfdf17039 100644
--- a/drivers/usb/media/w9968cf.c
+++ b/drivers/usb/media/w9968cf.c
@@ -1573,7 +1573,6 @@ static int w9968cf_i2c_init(struct w9968cf_device* cam)
1573 int err = 0; 1573 int err = 0;
1574 1574
1575 static struct i2c_algorithm algo = { 1575 static struct i2c_algorithm algo = {
1576 .id = I2C_ALGO_SMBUS,
1577 .smbus_xfer = w9968cf_i2c_smbus_xfer, 1576 .smbus_xfer = w9968cf_i2c_smbus_xfer,
1578 .algo_control = w9968cf_i2c_control, 1577 .algo_control = w9968cf_i2c_control,
1579 .functionality = w9968cf_i2c_func, 1578 .functionality = w9968cf_i2c_func,
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index f04b1fc6a0fa..af4983b488b6 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -192,8 +192,6 @@ static inline char *i2c_clientname(struct i2c_client *c)
192 * to name two of the most common. 192 * to name two of the most common.
193 */ 193 */
194struct i2c_algorithm { 194struct i2c_algorithm {
195 unsigned int id;
196
197 /* If an adapter algorithm can't do I2C-level access, set master_xfer 195 /* If an adapter algorithm can't do I2C-level access, set master_xfer
198 to NULL. If an adapter algorithm can do SMBus access, set 196 to NULL. If an adapter algorithm can do SMBus access, set
199 smbus_xfer. If set to NULL, the SMBus protocol is simulated 197 smbus_xfer. If set to NULL, the SMBus protocol is simulated