clean duplicated macro

and add a new new one for range checks.

Change-Id: I077fc9d21f1b209c539561d9ebe42df4bf3125a5
CRs-fixed: 2750060
1 file changed