Merge branches 'acpi-cppc' and 'acpi-dptf'

[linux-2.6-microblaze.git] / lib / xarray.c

diff --git a/lib/xarray.c b/lib/xarray.c
index f5d8f54..6f47f63 100644 (file)
--- a/lib/xarray.c
+++ b/lib/xarray.c
@@ -157,7 +157,7 @@ static void xas_move_index(struct xa_state *xas, unsigned long offset)
        xas->xa_index += offset << shift;
 }
 
-static void xas_advance(struct xa_state *xas)
+static void xas_next_offset(struct xa_state *xas)
 {
        xas->xa_offset++;
        xas_move_index(xas, xas->xa_offset);
@@ -1250,7 +1250,7 @@ void *xas_find(struct xa_state *xas, unsigned long max)
                xas->xa_offset = ((xas->xa_index - 1) & XA_CHUNK_MASK) + 1;
        }
 
-       xas_advance(xas);
+       xas_next_offset(xas);
 
        while (xas->xa_node && (xas->xa_index <= max)) {
                if (unlikely(xas->xa_offset == XA_CHUNK_SIZE)) {
@@ -1268,7 +1268,7 @@ void *xas_find(struct xa_state *xas, unsigned long max)
                if (entry && !xa_is_sibling(entry))
                        return entry;
 
-               xas_advance(xas);
+               xas_next_offset(xas);
        }
 
        if (!xas->xa_node)