Skip to contentSkip to conversation

drivers/fsi: Change hub sysfs name

PATCH Applied Christopher Bostic 2 participants 2 messages Mar 2, 2017 – Mar 3, 2017 FSI

lore
Share & tools
lore

Christopher Bostic

author
#0 lore raw

PATCH v2 1/1 drivers/fsi: Change hub sysfs name

Fix duplicate "hub@00" naming bug when two or more hubs are detected during scan. Each hub was assigned id '00'. Duplicate hub device names were causing kernel warnings to console on every scan. Create a unique name by using the upstream master's idx field. i.e. hub@00, hub@01, ...

Signed-off-by Christopher Bostic <[email protected]>

---
v2:
Add more description for the change.

---
 drivers/fsi/fsi-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/fsi/fsi-core.c +1 -1
index 542544e..b9573c5 100644
@@ -437,7 +437,7 @@ static int fsi_slave_scan(struct fsi_slave *slave)
 				return -ENOMEM;
 
 			device_initialize(&hub->dev);
-			dev_set_name(&hub->dev, "hub@%02x", hub->master.idx);
+			dev_set_name(&hub->dev, "hub@%02x", slave->master->idx);
 			hub->dev.release = hub_master_release;
 			rc = device_add(&hub->dev);
 			if (rc)
Signature · 1 line
1.8.2.2
Applied
#1 lore raw
Quoted 10 lines · Christopher Bostic

Fix duplicate "hub@00" naming bug when two or more hubs are detected during scan. Each hub was assigned id '00'. Duplicate hub device names were causing kernel warnings to console on every scan. Create a unique name by using the upstream master's idx field. i.e. hub@00, hub@01, ...

Signed-off-by Christopher Bostic <[email protected]>

---
v2:
Add more description for the change.

Much better commit message. Thanks for the explanation.

Applied to dev-4.7.

Cheers,

Joel

Quoted 20 lines
---
 drivers/fsi/fsi-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/fsi/fsi-core.c +1 -2
index 542544e..b9573c5 100644
@@ -437,7 +437,7 @@ static int fsi_slave_scan(struct fsi_slave *slave)
                                return -ENOMEM;
 
                        device_initialize(&hub->dev);
-                       dev_set_name(&hub->dev, "hub@%02x", hub->master.idx);
+                       dev_set_name(&hub->dev, "hub@%02x", slave->master->idx);
                        hub->dev.release = hub_master_release;
                        rc = device_add(&hub->dev);
                        if (rc)
--

1.8.2.2