board-8960-regulator: fixup MACH_EXPRESS defines and remove dupe code

Change-Id: I01e75d8aa9fe2427d2e8261c754c6dfe4aa88476