diff options
38 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 fb5b732238ed..6e1e1601accb 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 | ||
521 | static struct i2c_algorithm i2c_bit_algo = { | 521 | static struct i2c_algorithm i2c_bit_algo = { |
522 | .name = "Bit-shift algorithm", | ||
523 | .id = I2C_ALGO_BIT, | 522 | .id = I2C_ALGO_BIT, |
524 | .master_xfer = bit_xfer, | 523 | .master_xfer = bit_xfer, |
525 | .functionality = bit_func, | 524 | .functionality = bit_func, |
diff --git a/drivers/i2c/algos/i2c-algo-ite.c b/drivers/i2c/algos/i2c-algo-ite.c index e6cae39f47aa..a9c2b1115e07 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 | ||
715 | static struct i2c_algorithm iic_algo = { | 715 | static struct i2c_algorithm iic_algo = { |
716 | .name = "ITE IIC algorithm", | ||
717 | .id = I2C_ALGO_IIC, | 716 | .id = I2C_ALGO_IIC, |
718 | .master_xfer = iic_xfer, | 717 | .master_xfer = iic_xfer, |
719 | .algo_control = algo_control, /* ioctl */ | 718 | .algo_control = algo_control, /* ioctl */ |
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c index ff2db0da4417..16157391cdf5 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 | ||
358 | static struct i2c_algorithm pca_algo = { | 358 | static struct i2c_algorithm pca_algo = { |
359 | .name = "PCA9564 algorithm", | ||
360 | .id = I2C_ALGO_PCA, | 359 | .id = I2C_ALGO_PCA, |
361 | .master_xfer = pca_xfer, | 360 | .master_xfer = pca_xfer, |
362 | .functionality = pca_func, | 361 | .functionality = pca_func, |
diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c index 8d087dac32af..eb3e9e39d75b 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 | ||
461 | static struct i2c_algorithm pcf_algo = { | 461 | static struct i2c_algorithm pcf_algo = { |
462 | .name = "PCF8584 algorithm", | ||
463 | .id = I2C_ALGO_PCF, | 462 | .id = I2C_ALGO_PCF, |
464 | .master_xfer = pcf_xfer, | 463 | .master_xfer = pcf_xfer, |
465 | .functionality = pcf_func, | 464 | .functionality = pcf_func, |
diff --git a/drivers/i2c/algos/i2c-algo-sgi.c b/drivers/i2c/algos/i2c-algo-sgi.c index 422721b241e5..55284c9e41dc 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 | ||
160 | static struct i2c_algorithm sgi_algo = { | 160 | static struct i2c_algorithm sgi_algo = { |
161 | .name = "SGI algorithm", | ||
162 | .id = I2C_ALGO_SGI, | 161 | .id = I2C_ALGO_SGI, |
163 | .master_xfer = sgi_xfer, | 162 | .master_xfer = sgi_xfer, |
164 | .functionality = sgi_func, | 163 | .functionality = sgi_func, |
diff --git a/drivers/i2c/algos/i2c-algo-sibyte.c b/drivers/i2c/algos/i2c-algo-sibyte.c index f2785499237b..4ca3e69461bc 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 | ||
137 | static struct i2c_algorithm i2c_sibyte_algo = { | 137 | static struct i2c_algorithm i2c_sibyte_algo = { |
138 | .name = "SiByte algorithm", | ||
139 | .id = I2C_ALGO_SIBYTE, | 138 | .id = I2C_ALGO_SIBYTE, |
140 | .smbus_xfer = smbus_xfer, | 139 | .smbus_xfer = smbus_xfer, |
141 | .algo_control = algo_control, /* ioctl */ | 140 | .algo_control = algo_control, /* ioctl */ |
diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c index f634a0780cf0..d7e05a1a5125 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 | ||
474 | static struct i2c_algorithm smbus_algorithm = { | 474 | static struct i2c_algorithm smbus_algorithm = { |
475 | .name = "Non-i2c SMBus adapter", | ||
476 | .id = I2C_ALGO_SMBUS, | 475 | .id = I2C_ALGO_SMBUS, |
477 | .smbus_xfer = ali1535_access, | 476 | .smbus_xfer = ali1535_access, |
478 | .functionality = ali1535_func, | 477 | .functionality = ali1535_func, |
diff --git a/drivers/i2c/busses/i2c-ali1563.c b/drivers/i2c/busses/i2c-ali1563.c index fdd881aee618..48f85e53d7d6 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 | ||
368 | static struct i2c_algorithm ali1563_algorithm = { | 368 | static struct i2c_algorithm ali1563_algorithm = { |
369 | .name = "Non-i2c SMBus adapter", | ||
370 | .id = I2C_ALGO_SMBUS, | 369 | .id = I2C_ALGO_SMBUS, |
371 | .smbus_xfer = ali1563_access, | 370 | .smbus_xfer = ali1563_access, |
372 | .functionality = ali1563_func, | 371 | .functionality = ali1563_func, |
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c index 0f781a1a3323..523f0129e4cd 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 | ||
464 | static struct i2c_algorithm smbus_algorithm = { | 464 | static struct i2c_algorithm smbus_algorithm = { |
465 | .name = "Non-I2C SMBus adapter", | ||
466 | .id = I2C_ALGO_SMBUS, | 465 | .id = I2C_ALGO_SMBUS, |
467 | .smbus_xfer = ali15x3_access, | 466 | .smbus_xfer = ali15x3_access, |
468 | .functionality = ali15x3_func, | 467 | .functionality = ali15x3_func, |
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c index 6347ebc6fb53..7cf33325ac14 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 | ||
297 | static struct i2c_algorithm smbus_algorithm = { | 297 | static struct i2c_algorithm smbus_algorithm = { |
298 | .name = "Non-I2C SMBus adapter", | ||
299 | .id = I2C_ALGO_SMBUS, | 298 | .id = I2C_ALGO_SMBUS, |
300 | .smbus_xfer = amd756_access, | 299 | .smbus_xfer = amd756_access, |
301 | .functionality = amd756_func, | 300 | .functionality = amd756_func, |
diff --git a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c index d6644481d2a0..3b98d3b40042 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 | ||
325 | static struct i2c_algorithm smbus_algorithm = { | 325 | static struct i2c_algorithm smbus_algorithm = { |
326 | .name = "Non-I2C SMBus 2.0 adapter", | ||
327 | .id = I2C_ALGO_SMBUS, | 326 | .id = I2C_ALGO_SMBUS, |
328 | .smbus_xfer = amd8111_access, | 327 | .smbus_xfer = amd8111_access, |
329 | .functionality = amd8111_func, | 328 | .functionality = amd8111_func, |
diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c index a7ff112e49bf..41fff3531aee 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 | ||
285 | static struct i2c_algorithm au1550_algo = { | 285 | static struct i2c_algorithm au1550_algo = { |
286 | .name = "Au1550 algorithm", | ||
287 | .id = I2C_ALGO_AU1550, | 286 | .id = I2C_ALGO_AU1550, |
288 | .master_xfer = au1550_xfer, | 287 | .master_xfer = au1550_xfer, |
289 | .functionality = au1550_func, | 288 | .functionality = au1550_func, |
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index 1ab41313ce51..b916317b76a6 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 | ||
537 | static struct i2c_algorithm smbus_algorithm = { | 537 | static struct i2c_algorithm smbus_algorithm = { |
538 | .name = "Non-I2C SMBus adapter", | ||
539 | .id = I2C_ALGO_SMBUS, | 538 | .id = I2C_ALGO_SMBUS, |
540 | .smbus_xfer = i801_access, | 539 | .smbus_xfer = i801_access, |
541 | .functionality = i801_func, | 540 | .functionality = i801_func, |
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c index 93ca36dc777e..1a3366287087 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 | ||
629 | static struct i2c_algorithm iic_algo = { | 629 | static struct i2c_algorithm iic_algo = { |
630 | .name = "IBM IIC algorithm", | ||
631 | .id = I2C_ALGO_OCP, | 630 | .id = I2C_ALGO_OCP, |
632 | .master_xfer = iic_xfer, | 631 | .master_xfer = iic_xfer, |
633 | .functionality = iic_func | 632 | .functionality = iic_func |
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c index 6b682e903f09..c763039638d9 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 | ||
401 | static struct i2c_algorithm iop3xx_i2c_algo = { | 401 | static struct i2c_algorithm iop3xx_i2c_algo = { |
402 | .name = "IOP3xx I2C algorithm", | ||
403 | .id = I2C_ALGO_IOP3XX, | 402 | .id = I2C_ALGO_IOP3XX, |
404 | .master_xfer = iop3xx_i2c_master_xfer, | 403 | .master_xfer = iop3xx_i2c_master_xfer, |
405 | .algo_control = iop3xx_i2c_algo_control, | 404 | .algo_control = iop3xx_i2c_algo_control, |
diff --git a/drivers/i2c/busses/i2c-isa.c b/drivers/i2c/busses/i2c-isa.c index a60f4801757e..bbfd4449b921 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 */ |
45 | static struct i2c_algorithm isa_algorithm = { | 45 | static struct i2c_algorithm isa_algorithm = { |
46 | .name = "ISA bus algorithm", | ||
47 | .id = I2C_ALGO_ISA, | 46 | .id = I2C_ALGO_ISA, |
48 | .functionality = isa_func, | 47 | .functionality = isa_func, |
49 | }; | 48 | }; |
diff --git a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c index 94ae808314f7..2937f115abf1 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) */ |
500 | static struct i2c_algorithm keywest_algorithm = { | 500 | static struct i2c_algorithm keywest_algorithm = { |
501 | .name = "Keywest i2c", | ||
502 | .id = I2C_ALGO_SMBUS, | 501 | .id = I2C_ALGO_SMBUS, |
503 | .smbus_xfer = keywest_smbus_xfer, | 502 | .smbus_xfer = keywest_smbus_xfer, |
504 | .master_xfer = keywest_xfer, | 503 | .master_xfer = keywest_xfer, |
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index 9ad3e9262e8a..ae988cc8cb48 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 | ||
274 | static struct i2c_algorithm mpc_algo = { | 274 | static struct i2c_algorithm mpc_algo = { |
275 | .name = "MPC algorithm", | ||
276 | .id = I2C_ALGO_MPC107, | 275 | .id = I2C_ALGO_MPC107, |
277 | .master_xfer = mpc_xfer, | 276 | .master_xfer = mpc_xfer, |
278 | .functionality = mpc_functionality, | 277 | .functionality = mpc_functionality, |
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index 5b852782d2f5..f5927c68784c 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 | ||
435 | static struct i2c_algorithm mv64xxx_i2c_algo = { | 435 | static struct i2c_algorithm mv64xxx_i2c_algo = { |
436 | .name = MV64XXX_I2C_CTLR_NAME " algorithm", | ||
437 | .id = I2C_ALGO_MV64XXX, | 436 | .id = I2C_ALGO_MV64XXX, |
438 | .master_xfer = mv64xxx_i2c_xfer, | 437 | .master_xfer = mv64xxx_i2c_xfer, |
439 | .functionality = mv64xxx_i2c_functionality, | 438 | .functionality = mv64xxx_i2c_functionality, |
diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c index 1df601bb7f4f..44b6dfdd3832 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 | ||
112 | static struct i2c_algorithm smbus_algorithm = { | 112 | static struct i2c_algorithm smbus_algorithm = { |
113 | .name = "Non-I2C SMBus adapter", | ||
114 | .id = I2C_ALGO_SMBUS, | 113 | .id = I2C_ALGO_SMBUS, |
115 | .smbus_xfer = nforce2_access, | 114 | .smbus_xfer = nforce2_access, |
116 | .functionality = nforce2_func, | 115 | .functionality = nforce2_func, |
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c index 6d34ee381ce1..976df581e853 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 | ||
401 | static struct i2c_algorithm smbus_algorithm = { | 401 | static struct i2c_algorithm smbus_algorithm = { |
402 | .name = "Non-I2C SMBus adapter", | ||
403 | .id = I2C_ALGO_SMBUS, | 402 | .id = I2C_ALGO_SMBUS, |
404 | .smbus_xfer = piix4_access, | 403 | .smbus_xfer = piix4_access, |
405 | .functionality = piix4_func, | 404 | .functionality = piix4_func, |
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index a3b38257cc3d..73a092fb0e7e 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
@@ -568,7 +568,6 @@ static u32 s3c24xx_i2c_func(struct i2c_adapter *adap) | |||
568 | /* i2c bus registration info */ | 568 | /* i2c bus registration info */ |
569 | 569 | ||
570 | static struct i2c_algorithm s3c24xx_i2c_algorithm = { | 570 | static struct i2c_algorithm s3c24xx_i2c_algorithm = { |
571 | .name = "S3C2410-I2C-Algorithm", | ||
572 | .master_xfer = s3c24xx_i2c_xfer, | 571 | .master_xfer = s3c24xx_i2c_xfer, |
573 | .functionality = s3c24xx_i2c_func, | 572 | .functionality = s3c24xx_i2c_func, |
574 | }; | 573 | }; |
diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c index bbd5e4e52f09..0308ed87e2b9 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 | ||
359 | static struct i2c_algorithm smbus_algorithm = { | 359 | static struct i2c_algorithm smbus_algorithm = { |
360 | .name = "Non-I2C SMBus adapter", | ||
361 | .id = I2C_ALGO_SMBUS, | 360 | .id = I2C_ALGO_SMBUS, |
362 | .smbus_xfer = sis5595_access, | 361 | .smbus_xfer = sis5595_access, |
363 | .functionality = sis5595_func, | 362 | .functionality = sis5595_func, |
diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c index f58455e7689e..8708f9044023 100644 --- a/drivers/i2c/busses/i2c-sis630.c +++ b/drivers/i2c/busses/i2c-sis630.c | |||
@@ -448,7 +448,6 @@ exit: | |||
448 | 448 | ||
449 | 449 | ||
450 | static struct i2c_algorithm smbus_algorithm = { | 450 | static struct i2c_algorithm smbus_algorithm = { |
451 | .name = "Non-I2C SMBus adapter", | ||
452 | .id = I2C_ALGO_SMBUS, | 451 | .id = I2C_ALGO_SMBUS, |
453 | .smbus_xfer = sis630_access, | 452 | .smbus_xfer = sis630_access, |
454 | .functionality = sis630_func, | 453 | .functionality = sis630_func, |
diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c index 6484792e23a1..6e7202ed3265 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 | ||
251 | static struct i2c_algorithm smbus_algorithm = { | 251 | static struct i2c_algorithm smbus_algorithm = { |
252 | .name = "Non-I2C SMBus adapter", | ||
253 | .id = I2C_ALGO_SMBUS, | 252 | .id = I2C_ALGO_SMBUS, |
254 | .smbus_xfer = sis96x_access, | 253 | .smbus_xfer = sis96x_access, |
255 | .functionality = sis96x_func, | 254 | .functionality = sis96x_func, |
diff --git a/drivers/i2c/busses/i2c-stub.c b/drivers/i2c/busses/i2c-stub.c index 00d94e886955..d7203207754f 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 | ||
111 | static struct i2c_algorithm smbus_algorithm = { | 111 | static struct i2c_algorithm smbus_algorithm = { |
112 | .name = "Non-I2C SMBus adapter", | ||
113 | .id = I2C_ALGO_SMBUS, | 112 | .id = I2C_ALGO_SMBUS, |
114 | .functionality = stub_func, | 113 | .functionality = stub_func, |
115 | .smbus_xfer = stub_xfer, | 114 | .smbus_xfer = stub_xfer, |
diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c index 6b5008005c6f..608ad525e7e1 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 | ||
288 | static struct i2c_algorithm smbus_algorithm = { | 288 | static struct i2c_algorithm smbus_algorithm = { |
289 | .name = "Non-I2C SMBus adapter", | ||
290 | .id = I2C_ALGO_SMBUS, | 289 | .id = I2C_ALGO_SMBUS, |
291 | .smbus_xfer = vt596_access, | 290 | .smbus_xfer = vt596_access, |
292 | .functionality = vt596_func, | 291 | .functionality = vt596_func, |
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c index a18bdd9aa7ba..b695233d5455 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) */ |
397 | static struct i2c_algorithm scx200_acb_algorithm = { | 397 | static struct i2c_algorithm scx200_acb_algorithm = { |
398 | .name = "NatSemi SCx200 ACCESS.bus", | ||
399 | .id = I2C_ALGO_SMBUS, | 398 | .id = I2C_ALGO_SMBUS, |
400 | .smbus_xfer = scx200_acb_smbus_xfer, | 399 | .smbus_xfer = scx200_acb_smbus_xfer, |
401 | .functionality = scx200_acb_func, | 400 | .functionality = scx200_acb_func, |
diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c index 781f23f0cbcc..dceda86cd99d 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 | .name = "saa7146 i2c algorithm", | ||
391 | .id = I2C_ALGO_SAA7146, | 390 | .id = I2C_ALGO_SAA7146, |
392 | .master_xfer = saa7146_i2c_xfer, | 391 | .master_xfer = saa7146_i2c_xfer, |
393 | .functionality = saa7146_i2c_func, | 392 | .functionality = saa7146_i2c_func, |
diff --git a/drivers/media/dvb/b2c2/flexcop-i2c.c b/drivers/media/dvb/b2c2/flexcop-i2c.c index be4266d4ae91..75f2c94f3190 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 | .name = "FlexCop I2C algorithm", | ||
176 | .id = I2C_ALGO_BIT, | 175 | .id = I2C_ALGO_BIT, |
177 | .master_xfer = flexcop_master_xfer, | 176 | .master_xfer = flexcop_master_xfer, |
178 | .functionality = flexcop_i2c_func, | 177 | .functionality = flexcop_i2c_func, |
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c index c3e1b661aae6..36fe602f85b6 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 | .name = "Conexant USB I2C algorithm", | ||
145 | .id = I2C_ALGO_BIT, | 144 | .id = I2C_ALGO_BIT, |
146 | .master_xfer = cxusb_i2c_xfer, | 145 | .master_xfer = cxusb_i2c_xfer, |
147 | .functionality = cxusb_i2c_func, | 146 | .functionality = cxusb_i2c_func, |
diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c index 9b9d6f8ee74e..c3a639520e8a 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 | .name = "DiBcom USB I2C algorithm", | ||
160 | .id = I2C_ALGO_BIT, | 159 | .id = I2C_ALGO_BIT, |
161 | .master_xfer = dibusb_i2c_xfer, | 160 | .master_xfer = dibusb_i2c_xfer, |
162 | .functionality = dibusb_i2c_func, | 161 | .functionality = dibusb_i2c_func, |
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c index 9a676afc1d6e..6e4e1e9158e3 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 | .name = "Nebula DigiTV USB I2C algorithm", | ||
81 | .id = I2C_ALGO_BIT, | 80 | .id = I2C_ALGO_BIT, |
82 | .master_xfer = digitv_i2c_xfer, | 81 | .master_xfer = digitv_i2c_xfer, |
83 | .functionality = digitv_i2c_func, | 82 | .functionality = digitv_i2c_func, |
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c index aa43b5fcb8e7..c337ee546bac 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 | .name = "ttusb dec i2c algorithm", | ||
1476 | .id = I2C_ALGO_BIT, | 1475 | .id = I2C_ALGO_BIT, |
1477 | .master_xfer = master_xfer, | 1476 | .master_xfer = master_xfer, |
1478 | .functionality = functionality, | 1477 | .functionality = functionality, |
diff --git a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c index 234a85563769..dbc96fce7501 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 | .name = "bt878", | ||
274 | .id = I2C_ALGO_BIT | I2C_HW_B_BT848 /* FIXME */, | 273 | .id = I2C_ALGO_BIT | I2C_HW_B_BT848 /* FIXME */, |
275 | .master_xfer = bttv_i2c_xfer, | 274 | .master_xfer = bttv_i2c_xfer, |
276 | .algo_control = algo_control, | 275 | .algo_control = algo_control, |
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c index 1203b93a572c..1a53c7eb104a 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 | .name = "saa7134", | ||
374 | .id = I2C_ALGO_SAA7134, | 373 | .id = I2C_ALGO_SAA7134, |
375 | .master_xfer = saa7134_i2c_xfer, | 374 | .master_xfer = saa7134_i2c_xfer, |
376 | .algo_control = algo_control, | 375 | .algo_control = algo_control, |
diff --git a/drivers/usb/media/w9968cf.c b/drivers/usb/media/w9968cf.c index ca9f3a30634f..ad1d6777e226 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 | .name = "W996[87]CF algorithm", | ||
1577 | .id = I2C_ALGO_SMBUS, | 1576 | .id = I2C_ALGO_SMBUS, |
1578 | .smbus_xfer = w9968cf_i2c_smbus_xfer, | 1577 | .smbus_xfer = w9968cf_i2c_smbus_xfer, |
1579 | .algo_control = w9968cf_i2c_control, | 1578 | .algo_control = w9968cf_i2c_control, |
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 3ad3969b6f0d..f04b1fc6a0fa 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
@@ -192,7 +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 | */ |
194 | struct i2c_algorithm { | 194 | struct i2c_algorithm { |
195 | char name[32]; /* textual description */ | ||
196 | unsigned int id; | 195 | unsigned int id; |
197 | 196 | ||
198 | /* If an adapter algorithm can't do I2C-level access, set master_xfer | 197 | /* If an adapter algorithm can't do I2C-level access, set master_xfer |