Hi All,

The following two patches clean up the ACPI button a bit after the changes
made to it recently.  They are not expected to alter functionality.

They apply on top of

https://web.git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git/commit/?h=linux-next&id=abbdf22e0a8f23207cedf9065512620971794ff5

Thanks!