mirror of https://github.com/torvalds/linux.git
i2c: rename wait_for_completion callback to wait_for_completion_cb
Functionally no change. Remove the ambiguity of 'wait_for_completion'. It helps development of the DEPT dependency tracker, but seems favorable in any case. Signed-off-by: Byungchul Park <byungchul@sk.com> [wsa: reworded commit message] Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
This commit is contained in:
parent
1884f54e48
commit
b71a6e2a1b
|
|
@ -30,7 +30,7 @@ static int i2c_debug;
|
||||||
#define pca_clock(adap) adap->i2c_clock
|
#define pca_clock(adap) adap->i2c_clock
|
||||||
#define pca_set_con(adap, val) pca_outw(adap, I2C_PCA_CON, val)
|
#define pca_set_con(adap, val) pca_outw(adap, I2C_PCA_CON, val)
|
||||||
#define pca_get_con(adap) pca_inw(adap, I2C_PCA_CON)
|
#define pca_get_con(adap) pca_inw(adap, I2C_PCA_CON)
|
||||||
#define pca_wait(adap) adap->wait_for_completion(adap->data)
|
#define pca_wait(adap) adap->wait_for_completion_cb(adap->data)
|
||||||
|
|
||||||
static void pca_reset(struct i2c_algo_pca_data *adap)
|
static void pca_reset(struct i2c_algo_pca_data *adap)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -95,7 +95,7 @@ static struct i2c_algo_pca_data pca_isa_data = {
|
||||||
/* .data intentionally left NULL, not needed with ISA */
|
/* .data intentionally left NULL, not needed with ISA */
|
||||||
.write_byte = pca_isa_writebyte,
|
.write_byte = pca_isa_writebyte,
|
||||||
.read_byte = pca_isa_readbyte,
|
.read_byte = pca_isa_readbyte,
|
||||||
.wait_for_completion = pca_isa_waitforcompletion,
|
.wait_for_completion_cb = pca_isa_waitforcompletion,
|
||||||
.reset_chip = pca_isa_resetchip,
|
.reset_chip = pca_isa_resetchip,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -180,7 +180,7 @@ static int i2c_pca_pf_probe(struct platform_device *pdev)
|
||||||
}
|
}
|
||||||
|
|
||||||
i2c->algo_data.data = i2c;
|
i2c->algo_data.data = i2c;
|
||||||
i2c->algo_data.wait_for_completion = i2c_pca_pf_waitforcompletion;
|
i2c->algo_data.wait_for_completion_cb = i2c_pca_pf_waitforcompletion;
|
||||||
if (i2c->gpio)
|
if (i2c->gpio)
|
||||||
i2c->algo_data.reset_chip = i2c_pca_pf_resetchip;
|
i2c->algo_data.reset_chip = i2c_pca_pf_resetchip;
|
||||||
else
|
else
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,7 @@ struct i2c_algo_pca_data {
|
||||||
void *data; /* private low level data */
|
void *data; /* private low level data */
|
||||||
void (*write_byte) (void *data, int reg, int val);
|
void (*write_byte) (void *data, int reg, int val);
|
||||||
int (*read_byte) (void *data, int reg);
|
int (*read_byte) (void *data, int reg);
|
||||||
int (*wait_for_completion) (void *data);
|
int (*wait_for_completion_cb) (void *data);
|
||||||
void (*reset_chip) (void *data);
|
void (*reset_chip) (void *data);
|
||||||
/* For PCA9564, use one of the predefined frequencies:
|
/* For PCA9564, use one of the predefined frequencies:
|
||||||
* 330000, 288000, 217000, 146000, 88000, 59000, 44000, 36000
|
* 330000, 288000, 217000, 146000, 88000, 59000, 44000, 36000
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue