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.

[[email protected]: repair fallout]
[[email protected]: IB/mlx4: fix for MAX_ID_MASK to MAX_IDR_MASK name change]
Signed-off-by: Fengguang Wu <[email protected]>
Cc: Bernd Petrovitsch <[email protected]>
Cc: walter harms <[email protected]>
Cc: Glauber Costa <[email protected]>
Signed-off-by: Stephen Rothwell <[email protected]>
Cc: Roland Dreier <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Fengguang Wu 2012-10-04 17:13:15 -07:00 • committed by Linus Torvalds
commit 125c4c706b
8 changed files with 27 additions and 27 deletions

View file

@ -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);