This is mainly the same logic as in i2c_atr_find_mapping_by_addr(),
except for the missing dynamic detach / attach.
There's actually no reason for that logic to not be run, since it is
possible for a single channel to exceed alias pooling capabilities and
to need to remove some aliases before even finishing adding the
channels.
Signed-off-by: Cosmin Tanislav <demonsingur@xxxxxxxxx>
---
drivers/i2c/i2c-atr.c | 33 +++++++--------------------------
1 file changed, 7 insertions(+), 26 deletions(-)
diff --git a/drivers/i2c/i2c-atr.c b/drivers/i2c/i2c-atr.c
index 39b3b95c6842a..13f7e07fd8e87 100644
--- a/drivers/i2c/i2c-atr.c
+++ b/drivers/i2c/i2c-atr.c
@@ -488,41 +488,22 @@ static int i2c_atr_attach_addr(struct i2c_adapter *adapter,
struct i2c_atr_chan *chan = adapter->algo_data;
struct i2c_atr *atr = chan->atr;
struct i2c_atr_alias_pair *c2a;
- u16 alias;
- int ret;
-
- ret = i2c_atr_reserve_alias(chan->alias_pool);
- if (ret < 0) {
- dev_err(atr->dev, "failed to find a free alias\n");
- return ret;
- }
-
- alias = ret;
mutex_lock(&chan->alias_pairs_lock);
- c2a = i2c_atr_create_c2a(chan, alias, addr);
+ c2a = i2c_atr_find_mapping_by_addr(chan, addr);
if (!c2a) {
- ret = -ENOMEM;
- goto err_release_alias;
+ dev_err(atr->dev, "failed to find a free alias\n");
+ mutex_unlock(&chan->alias_pairs_lock);
+ return -EBUSY;
}
- ret = atr->ops->attach_addr(atr, chan->chan_id, addr, alias);
- if (ret)
- goto err_del_c2a;
-
dev_dbg(atr->dev, "chan%u: using alias 0x%02x for addr 0x%02x\n",
- chan->chan_id, alias, addr);
+ chan->chan_id, c2a->alias, addr);
- goto out_unlock;
-
-err_del_c2a:
- i2c_atr_destroy_c2a(&c2a);
-err_release_alias:
- i2c_atr_release_alias(chan->alias_pool, alias);
-out_unlock:
mutex_unlock(&chan->alias_pairs_lock);
- return ret;
+
+ return 0;
}
static void i2c_atr_detach_addr(struct i2c_adapter *adapter,
--
2.48.1
