mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
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:
parent
b74ca3b3fd
commit
125c4c706b
8 changed files with 27 additions and 27 deletions
|
|
@ -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:
|
||||
|
|
|
|||
Loading…
Reference in a new issue