Skip to contentSkip to conversation

staging: vme_user: simplify bus number allocation using ffz()

PATCH Superseded Dharanitharan R 2 participants 2 messages Dec 7, 2025

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 staging: vme_user: simplify bus number allocation using ffz()

David Laight pointed out that the loop in vme_register_bridge() is effectively searching for the first zero bit in vme_bus_numbers.

Replace the manual loop with ffz() and use BIT(n) for consistency.

---
 drivers/staging/vme_user/vme.c | 15 +++++++++++++----------
 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/staging/vme_user/vme.c +13 -10
index 2095de72596a..45381e677475 100644
@@ -1765,16 +1765,19 @@ int vme_register_bridge(struct vme_bridge *bridge)
 	int ret = -1;
 
 	mutex_lock(&vme_buses_lock);
-	for (i = 0; i < sizeof(vme_bus_numbers) * 8; i++){
-		if ((vme_bus_numbers & (1 << i)) == 0) {
-			vme_bus_numbers |= (1 << i);
-			bridge->num = i;
-			INIT_LIST_HEAD(&bridge->devices);
-			list_add_tail(&bridge->bus_list, &vme_bus_list);
-			ret = 0;
-			break;
-		}
+	
+	/* Find the first clear bit */
+	i = ffz(vme_bus_numbers);
+
+	/* Ensure we have a free slot */
+	if (i < BITS_PER_LONG) {
+		vme_bus_numbers |= BIT(i);
+        bridge->num = i;
+        INIT_LIST_HEAD(&bridge->devices);
+        list_add_tail(&bridge->bus_list, &vme_bus_list);
+        ret = 0;
+	}
 	mutex_unlock(&vme_buses_lock);
 
 	return ret;
@@ -1787,7 +1790,7 @@ void vme_unregister_bridge(struct vme_bridge *bridge)
 	struct vme_dev *tmp;
 
 	mutex_lock(&vme_buses_lock);
-	vme_bus_numbers &= ~(1 << bridge->num);
+	vme_bus_numbers &= ~BIT(bridge->num);
 	list_for_each_entry_safe(vdev, tmp, &bridge->devices, bridge_list) {
 		list_del(&vdev->drv_list);
 		list_del(&vdev->bridge_list);
Signature · 1 line
2.43.0
#1 lore raw
Quoted 21 lines · On Sun, 7 Dec 2025 16:43:17 +0000 Dharanitharan R…

David Laight pointed out that the loop in vme_register_bridge() is effectively searching for the first zero bit in vme_bus_numbers.

Replace the manual loop with ffz() and use BIT(n) for consistency.

---
 drivers/staging/vme_user/vme.c | 15 +++++++++++++----------
 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/staging/vme_user/vme.c +0 -2
index 2095de72596a..45381e677475 100644
@@ -1765,16 +1765,19 @@ int vme_register_bridge(struct vme_bridge *bridge)
 	int ret = -1;
 
 	mutex_lock(&vme_buses_lock);
-	for (i = 0; i < sizeof(vme_bus_numbers) * 8; i++){
-		if ((vme_bus_numbers & (1 << i)) == 0) {

drivers/staging/vme_user/vme.c int vme_register_bridge(struct vme_bridge *bridge) · line 1770

Quoted 10 lines
drivers/staging/vme_user/vme.c +3 -7
-			vme_bus_numbers |= (1 << i);
-			bridge->num = i;
-			INIT_LIST_HEAD(&bridge->devices);
-			list_add_tail(&bridge->bus_list, &vme_bus_list);
-			ret = 0;
-			break;
-		}
+	
+	/* Find the first clear bit */
+	i = ffz(vme_bus_numbers);

You need to check for ~0u first:

* ffz - find first zero in word.
* @word: The word to search
*
* Undefined if no zero exists, so code should check against ~0UL first.

David

Quoted 21 lines
drivers/staging/vme_user/vme.c +10 -1
+
+	/* Ensure we have a free slot */
+	if (i < BITS_PER_LONG) {
+		vme_bus_numbers |= BIT(i);
+        bridge->num = i;
+        INIT_LIST_HEAD(&bridge->devices);
+        list_add_tail(&bridge->bus_list, &vme_bus_list);
+        ret = 0;
+	}
 	mutex_unlock(&vme_buses_lock);
 
 	return ret;
@@ -1787,7 +1790,7 @@ void vme_unregister_bridge(struct vme_bridge *bridge)
 	struct vme_dev *tmp;
 
 	mutex_lock(&vme_buses_lock);
-	vme_bus_numbers &= ~(1 << bridge->num);
+	vme_bus_numbers &= ~BIT(bridge->num);
 	list_for_each_entry_safe(vdev, tmp, &bridge->devices, bridge_list) {
 		list_del(&vdev->drv_list);
 		list_del(&vdev->bridge_list);