summaryrefslogtreecommitdiffstats
path: root/drivers/pps
diff options
context:
space:
mode:
authorFengguang Wu <fengguang.wu@intel.com>2012-10-04 17:13:15 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-06 03:04:56 +0900
commit125c4c706b680c7831f0966ff873c1ad0354ec25 (patch)
tree2b45c5fdd3f69173774fc9ae92c3568cb9796d37 /drivers/pps
parentb74ca3b3fd0fac08167ff96287cece56e8ca6f4d (diff)
downloadlinux-stable-125c4c706b680c7831f0966ff873c1ad0354ec25.tar.gz
linux-stable-125c4c706b680c7831f0966ff873c1ad0354ec25.tar.bz2
linux-stable-125c4c706b680c7831f0966ff873c1ad0354ec25.zip
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>
Diffstat (limited to 'drivers/pps')
-rw-r--r--drivers/pps/pps.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pps/pps.c b/drivers/pps/pps.c
index e771487132f7..2420d5af0583 100644
--- 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);