Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08e5338d authored by David Miller's avatar David Miller Committed by Jean Delvare
Browse files

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



Pass adapter data into ->waitforpin() method.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent c429a247

drivers/i2c/algos/i2c-algo-pcf.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

drivers/i2c/busses/i2c-elektor.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

include/linux/i2c-algo-pcf.h

+1 −1
Original line number Diff line number Diff line
@@ -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