Skip to content

Commit b71a6e2

Browse files
Byungchul ParkWolfram Sang
authored andcommitted
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>
1 parent 1884f54 commit b71a6e2

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ static int i2c_debug;
3030
#define pca_clock(adap) adap->i2c_clock
3131
#define pca_set_con(adap, val) pca_outw(adap, I2C_PCA_CON, val)
3232
#define pca_get_con(adap) pca_inw(adap, I2C_PCA_CON)
33-
#define pca_wait(adap) adap->wait_for_completion(adap->data)
33+
#define pca_wait(adap) adap->wait_for_completion_cb(adap->data)
3434

3535
static void pca_reset(struct i2c_algo_pca_data *adap)
3636
{

drivers/i2c/busses/i2c-pca-isa.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ static struct i2c_algo_pca_data pca_isa_data = {
9595
/* .data intentionally left NULL, not needed with ISA */
9696
.write_byte = pca_isa_writebyte,
9797
.read_byte = pca_isa_readbyte,
98-
.wait_for_completion = pca_isa_waitforcompletion,
98+
.wait_for_completion_cb = pca_isa_waitforcompletion,
9999
.reset_chip = pca_isa_resetchip,
100100
};
101101

drivers/i2c/busses/i2c-pca-platform.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ static int i2c_pca_pf_probe(struct platform_device *pdev)
180180
}
181181

182182
i2c->algo_data.data = i2c;
183-
i2c->algo_data.wait_for_completion = i2c_pca_pf_waitforcompletion;
183+
i2c->algo_data.wait_for_completion_cb = i2c_pca_pf_waitforcompletion;
184184
if (i2c->gpio)
185185
i2c->algo_data.reset_chip = i2c_pca_pf_resetchip;
186186
else

include/linux/i2c-algo-pca.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ struct i2c_algo_pca_data {
7171
void *data; /* private low level data */
7272
void (*write_byte) (void *data, int reg, int val);
7373
int (*read_byte) (void *data, int reg);
74-
int (*wait_for_completion) (void *data);
74+
int (*wait_for_completion_cb) (void *data);
7575
void (*reset_chip) (void *data);
7676
/* For PCA9564, use one of the predefined frequencies:
7777
* 330000, 288000, 217000, 146000, 88000, 59000, 44000, 36000

0 commit comments

Comments
 (0)