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>

diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
index 74b66aec33d4c4dbd3f5795a9e6fbf45ebd6811d..ee86df4cff4b8cf4748f25ed1cc9fa0d2cddb7f5 100644 (file)
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -30,7 +30,7 @@ static int i2c_debug;
 #define pca_clock(adap) adap->i2c_clock
 #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_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)
 {

diff --git a/drivers/i2c/busses/i2c-pca-isa.c b/drivers/i2c/busses/i2c-pca-isa.c
index 85e8cf58e8bfcb469d0b43c65a61d722129c5d98..0cbf2f5095275771bd4f7334eb2f1924bbabdb67 100644 (file)
--- a/drivers/i2c/busses/i2c-pca-isa.c
+++ b/drivers/i2c/busses/i2c-pca-isa.c
@@ -95,7 +95,7 @@ static struct i2c_algo_pca_data pca_isa_data = {
        /* .data intentionally left NULL, not needed with ISA */
        .write_byte             = pca_isa_writebyte,
        .read_byte              = pca_isa_readbyte,
-       .wait_for_completion    = pca_isa_waitforcompletion,
+       .wait_for_completion_cb = pca_isa_waitforcompletion,
        .reset_chip             = pca_isa_resetchip,
 };
 

diff --git a/drivers/i2c/busses/i2c-pca-platform.c b/drivers/i2c/busses/i2c-pca-platform.c
index 87da8241b92707b74f034d2cc38fb3470d598d1f..c0f35ebbe37dd36f2da0f4f6efac13b6a8f3e513 100644 (file)
--- a/drivers/i2c/busses/i2c-pca-platform.c
+++ b/drivers/i2c/busses/i2c-pca-platform.c
@@ -180,7 +180,7 @@ static int i2c_pca_pf_probe(struct platform_device *pdev)
        }
 
        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)
                i2c->algo_data.reset_chip = i2c_pca_pf_resetchip;
        else

diff --git a/include/linux/i2c-algo-pca.h b/include/linux/i2c-algo-pca.h
index 7c522fdd9ea735280a2cd04ada1507e766967ff6..e305bf32e40a4c4f6c52f8b550bdf2a604e2ab13 100644 (file)
--- a/include/linux/i2c-algo-pca.h
+++ b/include/linux/i2c-algo-pca.h
@@ -71,7 +71,7 @@ struct i2c_algo_pca_data {
        void                            *data;  /* private low level data */
        void (*write_byte)              (void *data, int reg, int val);
        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);
        /* For PCA9564, use one of the predefined frequencies:
         * 330000, 288000, 217000, 146000, 88000, 59000, 44000, 36000