mirror of
https://github.com/torvalds/linux.git
synced 2025-11-02 17:49:03 +02:00
i2c: atr: deduplicate logic in attach_addr()
This is the same logic as in i2c_atr_create_mapping_by_addr(). Signed-off-by: Cosmin Tanislav <demonsingur@gmail.com> Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Reviewed-by: Romain Gantois <romain.gantois@bootlin.com> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
This commit is contained in:
parent
5efe815ad7
commit
02426327e2
1 changed files with 6 additions and 24 deletions
|
|
@ -538,38 +538,20 @@ 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;
|
||||
int ret = 0;
|
||||
|
||||
mutex_lock(&chan->alias_pairs_lock);
|
||||
|
||||
c2a = i2c_atr_create_c2a(chan, alias, addr);
|
||||
c2a = i2c_atr_create_mapping_by_addr(chan, addr);
|
||||
if (!c2a) {
|
||||
ret = -ENOMEM;
|
||||
goto err_release_alias;
|
||||
dev_err(atr->dev, "failed to find a free alias\n");
|
||||
ret = -EBUSY;
|
||||
goto out_unlock;
|
||||
}
|
||||
|
||||
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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue