lib/axmap: Simplify axmap_set_fn()

Instead of handling ffz(~overlap) == bit as a special case, handle
this case in the same way as ffz(~overlap) != bit. This patch does
not change any functionality but removes one if-instruction from the
hot path.

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>

diff --git a/lib/axmap.c b/lib/axmap.c
index 781a10395ac5b79a142078960260ba497336fa2f..336d7048e07d3c607d7c61542c1200797e3c616b 100644 (file)
--- a/lib/axmap.c
+++ b/lib/axmap.c
@@ -235,18 +235,12 @@ static bool axmap_set_fn(struct axmap_level *al, unsigned long offset,
         */
        overlap = al->map[offset] & mask;
        if (overlap == mask) {
-done:
                data->set_bits = 0;
                return true;
        }
 
        if (overlap) {
-               const int __bit = ffz(~overlap);
-
-               nr_bits = __bit - bit;
-               if (!nr_bits)
-                       goto done;
-
+               nr_bits = ffz(~overlap) - bit;
                mask = bit_masks[nr_bits] << bit;
        }