Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <dbrownell@users.sourceforge.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

authored by

David Brownell and committed by
Jean Delvare
3be27d37 e265cfa1

-56
-8
drivers/i2c/busses/i2c-iop3xx.c
··· 389 389 return im; 390 390 } 391 391 392 - static int 393 - iop3xx_i2c_algo_control(struct i2c_adapter *adapter, unsigned int cmd, 394 - unsigned long arg) 395 - { 396 - return 0; 397 - } 398 - 399 392 static u32 400 393 iop3xx_i2c_func(struct i2c_adapter *adap) 401 394 { ··· 397 404 398 405 static const struct i2c_algorithm iop3xx_i2c_algo = { 399 406 .master_xfer = iop3xx_i2c_master_xfer, 400 - .algo_control = iop3xx_i2c_algo_control, 401 407 .functionality = iop3xx_i2c_func, 402 408 }; 403 409
-7
drivers/media/video/bt8xx/bttv-i2c.c
··· 124 124 /* ----------------------------------------------------------------------- */ 125 125 /* I2C functions - hardware i2c */ 126 126 127 - static int algo_control(struct i2c_adapter *adapter, 128 - unsigned int cmd, unsigned long arg) 129 - { 130 - return 0; 131 - } 132 - 133 127 static u32 functionality(struct i2c_adapter *adap) 134 128 { 135 129 return I2C_FUNC_SMBUS_EMUL; ··· 272 278 273 279 static struct i2c_algorithm bttv_algo = { 274 280 .master_xfer = bttv_i2c_xfer, 275 - .algo_control = algo_control, 276 281 .functionality = functionality, 277 282 }; 278 283
-10
drivers/media/video/em28xx/em28xx-i2c.c
··· 383 383 /* ----------------------------------------------------------- */ 384 384 385 385 /* 386 - * algo_control() 387 - */ 388 - static int algo_control(struct i2c_adapter *adapter, 389 - unsigned int cmd, unsigned long arg) 390 - { 391 - return 0; 392 - } 393 - 394 - /* 395 386 * functionality() 396 387 */ 397 388 static u32 functionality(struct i2c_adapter *adap) ··· 466 475 467 476 static struct i2c_algorithm em28xx_algo = { 468 477 .master_xfer = em28xx_i2c_xfer, 469 - .algo_control = algo_control, 470 478 .functionality = functionality, 471 479 }; 472 480
-7
drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
··· 520 520 return ret; 521 521 } 522 522 523 - static int pvr2_i2c_control(struct i2c_adapter *adapter, 524 - unsigned int cmd, unsigned long arg) 525 - { 526 - return 0; 527 - } 528 - 529 523 static u32 pvr2_i2c_functionality(struct i2c_adapter *adap) 530 524 { 531 525 return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C; ··· 936 942 937 943 static struct i2c_algorithm pvr2_i2c_algo_template = { 938 944 .master_xfer = pvr2_i2c_xfer, 939 - .algo_control = pvr2_i2c_control, 940 945 .functionality = pvr2_i2c_functionality, 941 946 }; 942 947
-7
drivers/media/video/saa7134/saa7134-i2c.c
··· 314 314 315 315 /* ----------------------------------------------------------- */ 316 316 317 - static int algo_control(struct i2c_adapter *adapter, 318 - unsigned int cmd, unsigned long arg) 319 - { 320 - return 0; 321 - } 322 - 323 317 static u32 functionality(struct i2c_adapter *adap) 324 318 { 325 319 return I2C_FUNC_SMBUS_EMUL; ··· 381 387 382 388 static struct i2c_algorithm saa7134_algo = { 383 389 .master_xfer = saa7134_i2c_xfer, 384 - .algo_control = algo_control, 385 390 .functionality = functionality, 386 391 }; 387 392
-6
drivers/media/video/usbvision/usbvision-i2c.c
··· 183 183 return num; 184 184 } 185 185 186 - static int algo_control(struct i2c_adapter *adapter, unsigned int cmd, unsigned long arg) 187 - { 188 - return 0; 189 - } 190 - 191 186 static u32 functionality(struct i2c_adapter *adap) 192 187 { 193 188 return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR; ··· 194 199 static struct i2c_algorithm usbvision_algo = { 195 200 .master_xfer = usbvision_i2c_xfer, 196 201 .smbus_xfer = NULL, 197 - .algo_control = algo_control, 198 202 .functionality = functionality, 199 203 }; 200 204
-11
drivers/media/video/w9968cf.c
··· 444 444 static u32 w9968cf_i2c_func(struct i2c_adapter*); 445 445 static int w9968cf_i2c_attach_inform(struct i2c_client*); 446 446 static int w9968cf_i2c_detach_inform(struct i2c_client*); 447 - static int w9968cf_i2c_control(struct i2c_adapter*, unsigned int cmd, 448 - unsigned long arg); 449 447 450 448 /* Memory management */ 451 449 static void* rvmalloc(unsigned long size); ··· 1541 1543 } 1542 1544 1543 1545 1544 - static int 1545 - w9968cf_i2c_control(struct i2c_adapter* adapter, unsigned int cmd, 1546 - unsigned long arg) 1547 - { 1548 - return 0; 1549 - } 1550 - 1551 - 1552 1546 static int w9968cf_i2c_init(struct w9968cf_device* cam) 1553 1547 { 1554 1548 int err = 0; 1555 1549 1556 1550 static struct i2c_algorithm algo = { 1557 1551 .smbus_xfer = w9968cf_i2c_smbus_xfer, 1558 - .algo_control = w9968cf_i2c_control, 1559 1552 .functionality = w9968cf_i2c_func, 1560 1553 }; 1561 1554