x86: clean up esr_disable() methods