i2c: reword i2c_algorithm according to newest specification

Start changing the wording of the I2C main header wrt. the newest I2C
v7 and SMBus 3.2 specifications and replace "master/slave" with more
appropriate terms. The first step renames the members of struct
i2c_algorithm. Once all in-tree users are converted, the anonymous union
will go away again. All this work will also pave the way for finally
seperating the monolithic header into more fine-grained headers like
"i2c/clients.h" etc.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 424acb98c7c265cc80197d692600c7e4790f9c64..9d45b7b912ddb9f3e627d43c3c33a260c9aa290d 100644 (file)
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -548,10 +548,18 @@ struct i2c_algorithm {
         * master_xfer should return the number of messages successfully
         * processed, or a negative value on error
         */
-       int (*master_xfer)(struct i2c_adapter *adap, struct i2c_msg *msgs,
-                          int num);
-       int (*master_xfer_atomic)(struct i2c_adapter *adap,
+       union {
+               int (*xfer)(struct i2c_adapter *adap, struct i2c_msg *msgs,
+                           int num);
+               int (*master_xfer)(struct i2c_adapter *adap, struct i2c_msg *msgs,
+                                  int num);
+       };
+       union {
+               int (*xfer_atomic)(struct i2c_adapter *adap,
                                   struct i2c_msg *msgs, int num);
+               int (*master_xfer_atomic)(struct i2c_adapter *adap,
+                                          struct i2c_msg *msgs, int num);
+       };
        int (*smbus_xfer)(struct i2c_adapter *adap, u16 addr,
                          unsigned short flags, char read_write,
                          u8 command, int size, union i2c_smbus_data *data);
@@ -563,8 +571,14 @@ struct i2c_algorithm {
        u32 (*functionality)(struct i2c_adapter *adap);
 
 #if IS_ENABLED(CONFIG_I2C_SLAVE)
-       int (*reg_slave)(struct i2c_client *client);
-       int (*unreg_slave)(struct i2c_client *client);
+       union {
+               int (*reg_target)(struct i2c_client *client);
+               int (*reg_slave)(struct i2c_client *client);
+       };
+       union {
+               int (*unreg_target)(struct i2c_client *client);
+               int (*unreg_slave)(struct i2c_client *client);
+       };
 #endif
 };