idr: rename MAX_LEVEL to MAX_IDR_LEVEL
authorFengguang Wu <fengguang.wu@intel.com>
Fri, 5 Oct 2012 00:13:15 +0000 (17:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Oct 2012 18:04:56 +0000 (03:04 +0900)
commit125c4c706b680c7831f0966ff873c1ad0354ec25
tree2b45c5fdd3f69173774fc9ae92c3568cb9796d37
parentb74ca3b3fd0fac08167ff96287cece56e8ca6f4d
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>
drivers/i2c/i2c-core.c
drivers/infiniband/core/cm.c
drivers/infiniband/hw/mlx4/cm.c
drivers/pps/pps.c
drivers/thermal/thermal_sys.c
fs/super.c
include/linux/idr.h
lib/idr.c