]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
i3c: master: rename i3c_master_reattach_i3c_dev() to *_locked
authorLakshay Piplani <lakshay.piplani@nxp.com>
Fri, 12 Jun 2026 11:18:08 +0000 (16:48 +0530)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Mon, 15 Jun 2026 23:27:24 +0000 (01:27 +0200)
Rename i3c_master_reattach_i3c_dev() to *_locked() to make the locking
requirement explicit and consistent with other I3C core helpers that
require the bus lock to be held by the caller.

Signed-off-by: Lakshay Piplani <lakshay.piplani@nxp.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Link: https://patch.msgid.link/20260612111816.3688240-2-lakshay.piplani@nxp.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/i3c/master.c

index 109aa50eb1f8f7978eb8732883b930bea91e27a2..cf56865d875aa8bf2249f413e5ca74c35d0d9382 100644 (file)
@@ -1765,8 +1765,8 @@ static int i3c_master_attach_i3c_dev(struct i3c_master_controller *master,
        return 0;
 }
 
-static int i3c_master_reattach_i3c_dev(struct i3c_dev_desc *dev,
-                                      u8 old_dyn_addr)
+static int i3c_master_reattach_i3c_dev_locked(struct i3c_dev_desc *dev,
+                                             u8 old_dyn_addr)
 {
        struct i3c_master_controller *master = i3c_dev_get_master(dev);
        int ret;
@@ -1855,7 +1855,7 @@ static int i3c_master_early_i3c_dev_add(struct i3c_master_controller *master,
                goto err_detach_dev;
 
        i3cdev->info.dyn_addr = i3cdev->boardinfo->init_dyn_addr;
-       ret = i3c_master_reattach_i3c_dev(i3cdev, 0);
+       ret = i3c_master_reattach_i3c_dev_locked(i3cdev, 0);
        if (ret)
                goto err_rstdaa;
 
@@ -2425,7 +2425,7 @@ static void __i3c_master_add_i3c_dev_locked(struct i3c_master_controller *master
                if (!ret) {
                        old_dyn_addr = newdev->info.dyn_addr;
                        newdev->info.dyn_addr = expected_dyn_addr;
-                       i3c_master_reattach_i3c_dev(newdev, old_dyn_addr);
+                       i3c_master_reattach_i3c_dev_locked(newdev, old_dyn_addr);
                } else {
                        dev_err(&master->dev,
                                "Failed to assign reserved/old address to device %d%llx",