UBI: fastmap: use ubi_rb_for_each_entry() in unmap_peb()

Use the ubi_rb_for_each_entry() macro instead of open-coding it.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Richard Weinberger <richard@nod.at>

diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index bae80699c2f285507e6f1808259900756eb9ece1..1bfb4aeb67d407b524ea6dc72dd6f16203088dac 100644 (file)
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -385,12 +385,8 @@ static void unmap_peb(struct ubi_attach_info *ai, int pnum)
        struct rb_node *node, *node2;
        struct ubi_ainf_peb *aeb;
 
-       for (node = rb_first(&ai->volumes); node; node = rb_next(node)) {
-               av = rb_entry(node, struct ubi_ainf_volume, rb);
-
-               for (node2 = rb_first(&av->root); node2;
-                    node2 = rb_next(node2)) {
-                       aeb = rb_entry(node2, struct ubi_ainf_peb, u.rb);
+       ubi_rb_for_each_entry(node, av, &ai->volumes, rb) {
+               ubi_rb_for_each_entry(node2, aeb, &av->root, u.rb) {
                        if (aeb->pnum == pnum) {
                                rb_erase(&aeb->u.rb, &av->root);
                                av->leb_count--;