diff options
| author |   David Miller <davem@davemloft.net> | 2008-10-22 20:21:29 +0200 |
|---|---|---|
| committer |   Jean Delvare <khali@linux-fr.org> | 2008-10-22 20:21:29 +0200 |
| commit | 08e5338d119daeb3c7746fa80fa916b8d3d48e89 (patch) | |
| tree | 5a4b1985b4c9d3741d01f574de458bb0fd30084f | |
| parent | i2c-i801: Add support for Intel Ibex Peak (diff) | |
| download | linux-dev-08e5338d119daeb3c7746fa80fa916b8d3d48e89.tar.xz linux-dev-08e5338d119daeb3c7746fa80fa916b8d3d48e89.zip | |
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>
| -rw-r--r-- | drivers/i2c/algos/i2c-algo-pcf.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/busses/i2c-elektor.c | 3 | ||||
| -rw-r--r-- | include/linux/i2c-algo-pcf.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c index 1e328d19cd6d..a8a5b6d1dd88 100644 --- a/drivers/i2c/algos/i2c-algo-pcf.c +++ b/drivers/i2c/algos/i2c-algo-pcf.c @@ -135,7 +135,7 @@ static int wait_for_pin(struct i2c_algo_pcf_data *adap, int *status) { *status = get_pcf(adap, 1); #ifndef STUB_I2C while (timeout-- && (*status & I2C_PCF_PIN)) { - adap->waitforpin(); + adap->waitforpin(adap->data); *status = get_pcf(adap, 1); } if (*status & I2C_PCF_LAB) { diff --git a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c index 7f38c01fb3a0..0ed3ccb81b63 100644 --- a/drivers/i2c/busses/i2c-elektor.c +++ b/drivers/i2c/busses/i2c-elektor.c @@ -104,7 +104,8 @@ static int pcf_isa_getclock(void *data) return (clock); } -static void pcf_isa_waitforpin(void) { +static void pcf_isa_waitforpin(void *data) +{ DEFINE_WAIT(wait); int timeout = 2; unsigned long flags; diff --git a/include/linux/i2c-algo-pcf.h b/include/linux/i2c-algo-pcf.h index 0177d280f733..5de8a319bf14 100644 --- a/include/linux/i2c-algo-pcf.h +++ b/include/linux/i2c-algo-pcf.h @@ -31,7 +31,7 @@ struct i2c_algo_pcf_data { int (*getpcf) (void *data, int ctl); int (*getown) (void *data); int (*getclock) (void *data); - void (*waitforpin) (void); + void (*waitforpin) (void *data); /* Multi-master lost arbitration back-off delay (msecs) * This should be set by the bus adapter or knowledgable client |