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

i2c-algo-pcf: Pass adapter data into ->waitforpin() method

Pass adapter data into ->waitforpin() method.

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

authored by

David Miller and committed by
Jean Delvare 08e5338d c429a247

+4 -3
+1 -1
drivers/i2c/algos/i2c-algo-pcf.c
··· 135 135 *status = get_pcf(adap, 1); 136 136 #ifndef STUB_I2C 137 137 while (timeout-- && (*status & I2C_PCF_PIN)) { 138 - adap->waitforpin(); 138 + adap->waitforpin(adap->data); 139 139 *status = get_pcf(adap, 1); 140 140 } 141 141 if (*status & I2C_PCF_LAB) {
+2 -1
drivers/i2c/busses/i2c-elektor.c
··· 104 104 return (clock); 105 105 } 106 106 107 - static void pcf_isa_waitforpin(void) { 107 + static void pcf_isa_waitforpin(void *data) 108 + { 108 109 DEFINE_WAIT(wait); 109 110 int timeout = 2; 110 111 unsigned long flags;
+1 -1
include/linux/i2c-algo-pcf.h
··· 31 31 int (*getpcf) (void *data, int ctl); 32 32 int (*getown) (void *data); 33 33 int (*getclock) (void *data); 34 - void (*waitforpin) (void); 34 + void (*waitforpin) (void *data); 35 35 36 36 /* Multi-master lost arbitration back-off delay (msecs) 37 37 * This should be set by the bus adapter or knowledgable client