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.

[akpm@linux-foundation.org: repair fallout]
[sfr@canb.auug.org.au: IB/mlx4: fix for MAX_ID_MASK to MAX_IDR_MASK name change]
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: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Roland Dreier <roland@purestorage.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 2091ae8f539a5e78ee59338cd29876109b22883d..2421d95130d48ac526ac0203be47b614c4254617 100644 (file)
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -982,7 +982,7 @@ int i2c_add_numbered_adapter(struct i2c_adapter *adap)
 
        if (adap->nr == -1) /* -1 means dynamically assign bus id */
                return i2c_add_adapter(adap);
-       if (adap->nr & ~MAX_ID_MASK)
+       if (adap->nr & ~MAX_IDR_MASK)
                return -EINVAL;
 
 retry:

diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index d67999f6e34a147a6f99cdcd162fba4ebfdbb82d..394fea2ba1bc2018cac2f047ee7f0802823b0222 100644 (file)
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -390,7 +390,7 @@ static int cm_alloc_id(struct cm_id_private *cm_id_priv)
                ret = idr_get_new_above(&cm.local_id_table, cm_id_priv,
                                        next_id, &id);
                if (!ret)
-                       next_id = ((unsigned) id + 1) & MAX_ID_MASK;
+                       next_id = ((unsigned) id + 1) & MAX_IDR_MASK;
                spin_unlock_irqrestore(&cm.lock, flags);
        } while( (ret == -EAGAIN) && idr_pre_get(&cm.local_id_table, GFP_KERNEL) );
 

diff --git a/drivers/infiniband/hw/mlx4/cm.c b/drivers/infiniband/hw/mlx4/cm.c
index e25e4dafb8a8dd26e7dfc37fe8c655753aa5ddac..80079e5a2e30f47da6e781d6d5932cab519571d4 100644 (file)
--- a/drivers/infiniband/hw/mlx4/cm.c
+++ b/drivers/infiniband/hw/mlx4/cm.c
@@ -225,7 +225,7 @@ id_map_alloc(struct ib_device *ibdev, int slave_id, u32 sl_cm_id)
                ret = idr_get_new_above(&sriov->pv_id_table, ent,
                                        next_id, &id);
                if (!ret) {
-                       next_id = ((unsigned) id + 1) & MAX_ID_MASK;
+                       next_id = ((unsigned) id + 1) & MAX_IDR_MASK;
                        ent->pv_cm_id = (u32)id;
                        sl_id_map_add(ibdev, ent);
                }

diff --git a/drivers/pps/pps.c b/drivers/pps/pps.c
index e771487132f7542123a0e8a669cd8582481ab051..2420d5af05839a8403bf6b0bd00fe07ad9c5ae42 100644 (file)
--- a/drivers/pps/pps.c
+++ b/drivers/pps/pps.c
@@ -306,7 +306,7 @@ int pps_register_cdev(struct pps_device *pps)
        if (err < 0)
                return err;
 
-       pps->id &= MAX_ID_MASK;
+       pps->id &= MAX_IDR_MASK;
        if (pps->id >= PPS_MAX_SOURCES) {
                pr_err("%s: too many PPS sources in the system\n",
                                        pps->info.name);

diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 67789b8345d25cb7a5fad998863aab3c9d999689..efd81bb25e0157926ac8a03a556758f2ed124b1a 100644 (file)
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -78,7 +78,7 @@ again:
        else if (unlikely(err))
                return err;
 
-       *id = *id & MAX_ID_MASK;
+       *id = *id & MAX_IDR_MASK;
        return 0;
 }
 

diff --git a/fs/super.c b/fs/super.c
index 5fdf7ff32c4e283e74373bbabe00f9e165d5aa41..a3bc935069d9d5c643657793602ea42201263ed4 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -865,7 +865,7 @@ int get_anon_bdev(dev_t *p)
        else if (error)
                return -EAGAIN;
 
-       if ((dev & MAX_ID_MASK) == (1 << MINORBITS)) {
+       if ((dev & MAX_IDR_MASK) == (1 << MINORBITS)) {
                spin_lock(&unnamed_dev_lock);
                ida_remove(&unnamed_dev_ida, dev);
                if (unnamed_dev_start > dev)

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..648239079dd21329f0329ddaf12552677149d846 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;
@@ -223,7 +223,7 @@ build_up:
         * Add a new layer to the top of the tree if the requested
         * id is larger than the currently allocated space.
         */
-       while ((layers < (MAX_LEVEL - 1)) && (id >= (1 << (layers*IDR_BITS)))) {
+       while ((layers < (MAX_IDR_LEVEL - 1)) && (id >= (1 << (layers*IDR_BITS)))) {
                layers++;
                if (!p->count) {
                        /* special case: if the tree is currently empty,
@@ -265,7 +265,7 @@ build_up:
 
 static int idr_get_new_above_int(struct idr *idp, void *ptr, int starting_id)
 {
-       struct idr_layer *pa[MAX_LEVEL];
+       struct idr_layer *pa[MAX_IDR_LEVEL];
        int id;
 
        id = idr_get_empty_slot(idp, starting_id, pa);
@@ -357,7 +357,7 @@ static void idr_remove_warning(int id)
 static void sub_remove(struct idr *idp, int shift, int id)
 {
        struct idr_layer *p = idp->top;
-       struct idr_layer **pa[MAX_LEVEL];
+       struct idr_layer **pa[MAX_IDR_LEVEL];
        struct idr_layer ***paa = &pa[0];
        struct idr_layer *to_free;
        int n;
@@ -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
@@ -451,7 +451,7 @@ void idr_remove_all(struct idr *idp)
        int n, id, max;
        int bt_mask;
        struct idr_layer *p;
-       struct idr_layer *pa[MAX_LEVEL];
+       struct idr_layer *pa[MAX_IDR_LEVEL];
        struct idr_layer **paa = &pa[0];
 
        n = idp->layers * IDR_BITS;
@@ -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;
@@ -555,7 +555,7 @@ int idr_for_each(struct idr *idp,
 {
        int n, id, max, error = 0;
        struct idr_layer *p;
-       struct idr_layer *pa[MAX_LEVEL];
+       struct idr_layer *pa[MAX_IDR_LEVEL];
        struct idr_layer **paa = &pa[0];
 
        n = idp->layers * IDR_BITS;
@@ -601,7 +601,7 @@ EXPORT_SYMBOL(idr_for_each);
  */
 void *idr_get_next(struct idr *idp, int *nextidp)
 {
-       struct idr_layer *p, *pa[MAX_LEVEL];
+       struct idr_layer *p, *pa[MAX_IDR_LEVEL];
        struct idr_layer **paa = &pa[0];
        int id = *nextidp;
        int n, max;
@@ -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);
@@ -780,7 +780,7 @@ EXPORT_SYMBOL(ida_pre_get);
  */
 int ida_get_new_above(struct ida *ida, int starting_id, int *p_id)
 {
-       struct idr_layer *pa[MAX_LEVEL];
+       struct idr_layer *pa[MAX_IDR_LEVEL];
        struct ida_bitmap *bitmap;
        unsigned long flags;
        int idr_id = starting_id / IDA_BITMAP_BITS;
@@ -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);