idr: rename MAX_LEVEL to MAX_IDR_LEVEL

To avoid name conflicts:

drivers/video/riva/fbdev.c:281:9: sparse: preprocessor token MAX_LEVEL redefined

While at it, also make the other names more consistent and add
parentheses.

Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Cc: Bernd Petrovitsch <bernd@petrovitsch.priv.at>
Cc: walter harms <wharms@bfs.de>
Cc: Glauber Costa <glommer@parallels.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/idr.h b/include/linux/idr.h
index 255491cf522e1d08ea6d0066fc7872f32817c82c..87259a44c251472595598f0f6ed0852655171554 100644 (file)
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
@@ -38,15 +38,15 @@
 #define IDR_SIZE (1 << IDR_BITS)
 #define IDR_MASK ((1 << IDR_BITS)-1)
 
-#define MAX_ID_SHIFT (sizeof(int)*8 - 1)
-#define MAX_ID_BIT (1U << MAX_ID_SHIFT)
-#define MAX_ID_MASK (MAX_ID_BIT - 1)
+#define MAX_IDR_SHIFT (sizeof(int)*8 - 1)
+#define MAX_IDR_BIT (1U << MAX_IDR_SHIFT)
+#define MAX_IDR_MASK (MAX_IDR_BIT - 1)
 
 /* Leave the possibility of an incomplete final layer */
-#define MAX_LEVEL (MAX_ID_SHIFT + IDR_BITS - 1) / IDR_BITS
+#define MAX_IDR_LEVEL ((MAX_IDR_SHIFT + IDR_BITS - 1) / IDR_BITS)
 
 /* Number of id_layer structs to leave in free list */
-#define IDR_FREE_MAX MAX_LEVEL + MAX_LEVEL
+#define MAX_IDR_FREE (MAX_IDR_LEVEL * 2)
 
 struct idr_layer {
        unsigned long            bitmap; /* A zero bit means "space here" */

diff --git a/lib/idr.c b/lib/idr.c
index 4046e29c0a997bb38fd3892adeb55a4cf4914e31..746601f2a466cf8b0ed419f81ba67a1666db99d9 100644 (file)
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -20,7 +20,7 @@
  * that id to this code and it returns your pointer.
 
  * You can release ids at any time. When all ids are released, most of
- * the memory is returned (we keep IDR_FREE_MAX) in a local pool so we
+ * the memory is returned (we keep MAX_IDR_FREE) in a local pool so we
  * don't need to go to the memory "store" during an id allocate, just
  * so you don't need to be too concerned about locking and conflicts
  * with the slab allocator.
@@ -122,7 +122,7 @@ static void idr_mark_full(struct idr_layer **pa, int id)
  */
 int idr_pre_get(struct idr *idp, gfp_t gfp_mask)
 {
-       while (idp->id_free_cnt < IDR_FREE_MAX) {
+       while (idp->id_free_cnt < MAX_IDR_FREE) {
                struct idr_layer *new;
                new = kmem_cache_zalloc(idr_layer_cache, gfp_mask);
                if (new == NULL)
@@ -179,7 +179,7 @@ static int sub_alloc(struct idr *idp, int *starting_id, struct idr_layer **pa)
                        sh = IDR_BITS*l;
                        id = ((id >> sh) ^ n ^ m) << sh;
                }
-               if ((id >= MAX_ID_BIT) || (id < 0))
+               if ((id >= MAX_IDR_BIT) || (id < 0))
                        return IDR_NOMORE_SPACE;
                if (l == 0)
                        break;
@@ -402,7 +402,7 @@ void idr_remove(struct idr *idp, int id)
        struct idr_layer *to_free;
 
        /* Mask off upper bits we don't use for the search. */
-       id &= MAX_ID_MASK;
+       id &= MAX_IDR_MASK;
 
        sub_remove(idp, (idp->layers - 1) * IDR_BITS, id);
        if (idp->top && idp->top->count == 1 && (idp->layers > 1) &&
@@ -420,7 +420,7 @@ void idr_remove(struct idr *idp, int id)
                to_free->bitmap = to_free->count = 0;
                free_layer(to_free);
        }
-       while (idp->id_free_cnt >= IDR_FREE_MAX) {
+       while (idp->id_free_cnt >= MAX_IDR_FREE) {
                p = get_from_free_list(idp);
                /*
                 * Note: we don't call the rcu callback here, since the only
@@ -517,7 +517,7 @@ void *idr_find(struct idr *idp, int id)
        n = (p->layer+1) * IDR_BITS;
 
        /* Mask off upper bits we don't use for the search. */
-       id &= MAX_ID_MASK;
+       id &= MAX_IDR_MASK;
 
        if (id >= (1 << n))
                return NULL;
@@ -659,7 +659,7 @@ void *idr_replace(struct idr *idp, void *ptr, int id)
 
        n = (p->layer+1) * IDR_BITS;
 
-       id &= MAX_ID_MASK;
+       id &= MAX_IDR_MASK;
 
        if (id >= (1 << n))
                return ERR_PTR(-EINVAL);
@@ -793,7 +793,7 @@ int ida_get_new_above(struct ida *ida, int starting_id, int *p_id)
        if (t < 0)
                return _idr_rc_to_errno(t);
 
-       if (t * IDA_BITMAP_BITS >= MAX_ID_BIT)
+       if (t * IDA_BITMAP_BITS >= MAX_IDR_BIT)
                return -ENOSPC;
 
        if (t != idr_id)
@@ -827,7 +827,7 @@ int ida_get_new_above(struct ida *ida, int starting_id, int *p_id)
        }
 
        id = idr_id * IDA_BITMAP_BITS + t;
-       if (id >= MAX_ID_BIT)
+       if (id >= MAX_IDR_BIT)
                return -ENOSPC;
 
        __set_bit(t, bitmap->bitmap);