M2: msm: simplify ifdefs (no functional change)

I made these before we had a unified "MACH_M2" (thanks invisiblek).
Looks better now.

Change-Id: Ibfd7e22267acb13eea7fc1778994affccbec196d