i2c: rename field 'alias_list' of struct i2c_atr_chan to 'alias_pairs'

The "alias_list" field of struct i2c_atr_chan describes translation table
entries programmed in the ATR channel. This terminology will become more
confusing when per-channel alias pool support is introduced, as struct
i2c_atr_chan will gain a new field called "alias_pool", which will describe
aliases which are available to the ATR channel.

Rename the "alias_list" field to "alias_pairs" to clearly distinguish it
from the future "alias_pool" field.

No functional change is intended.

Tested-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: Romain Gantois <romain.gantois@bootlin.com>
Acked-by: Andi Shyti <andi.shyti@kernel.org>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

diff --git a/drivers/i2c/i2c-atr.c b/drivers/i2c/i2c-atr.c
index e9c6b85e3e4a4ff84fdf9ad139f05fdceb441120..01f8c6f6e68a0a6012101a201c3fd8c7c0f25b47 100644 (file)
--- a/drivers/i2c/i2c-atr.c
+++ b/drivers/i2c/i2c-atr.c
@@ -56,7 +56,7 @@ struct i2c_atr_alias_pool {
  * @adap:            The &struct i2c_adapter for the channel
  * @atr:             The parent I2C ATR
  * @chan_id:         The ID of this channel
- * @alias_list:      List of @struct i2c_atr_alias_pair containing the
+ * @alias_pairs:     List of @struct i2c_atr_alias_pair containing the
  *                   assigned aliases
  * @orig_addrs_lock: Mutex protecting @orig_addrs
  * @orig_addrs:      Buffer used to store the original addresses during transmit
@@ -67,7 +67,7 @@ struct i2c_atr_chan {
        struct i2c_atr *atr;
        u32 chan_id;
 
-       struct list_head alias_list;
+       struct list_head alias_pairs;
 
        /* Lock orig_addrs during xfer */
        struct mutex orig_addrs_lock;
@@ -192,7 +192,7 @@ static int i2c_atr_map_msgs(struct i2c_atr_chan *chan, struct i2c_msg *msgs,
        for (i = 0; i < num; i++) {
                chan->orig_addrs[i] = msgs[i].addr;
 
-               c2a = i2c_atr_find_mapping_by_addr(&chan->alias_list,
+               c2a = i2c_atr_find_mapping_by_addr(&chan->alias_pairs,
                                                   msgs[i].addr);
                if (!c2a) {
                        dev_err(atr->dev, "client 0x%02x not mapped!\n",
@@ -262,7 +262,7 @@ static int i2c_atr_smbus_xfer(struct i2c_adapter *adap, u16 addr,
        struct i2c_adapter *parent = atr->parent;
        struct i2c_atr_alias_pair *c2a;
 
-       c2a = i2c_atr_find_mapping_by_addr(&chan->alias_list, addr);
+       c2a = i2c_atr_find_mapping_by_addr(&chan->alias_pairs, addr);
        if (!c2a) {
                dev_err(atr->dev, "client 0x%02x not mapped!\n", addr);
                return -ENXIO;
@@ -380,7 +380,7 @@ static int i2c_atr_attach_addr(struct i2c_adapter *adapter,
 
        c2a->addr = addr;
        c2a->alias = alias;
-       list_add(&c2a->node, &chan->alias_list);
+       list_add(&c2a->node, &chan->alias_pairs);
 
        return 0;
 
@@ -401,7 +401,7 @@ static void i2c_atr_detach_addr(struct i2c_adapter *adapter,
 
        atr->ops->detach_addr(atr, chan->chan_id, addr);
 
-       c2a = i2c_atr_find_mapping_by_addr(&chan->alias_list, addr);
+       c2a = i2c_atr_find_mapping_by_addr(&chan->alias_pairs, addr);
        if (!c2a) {
                 /* This should never happen */
                dev_warn(atr->dev, "Unable to find address mapping\n");
@@ -621,7 +621,7 @@ int i2c_atr_add_adapter(struct i2c_atr *atr, u32 chan_id,
 
        chan->atr = atr;
        chan->chan_id = chan_id;
-       INIT_LIST_HEAD(&chan->alias_list);
+       INIT_LIST_HEAD(&chan->alias_pairs);
        mutex_init(&chan->orig_addrs_lock);
 
        snprintf(chan->adap.name, sizeof(chan->adap.name), "i2c-%d-atr-%d",