Revert "mako_hotplug: add my latest Hotplug driver code squash."

This reverts commit 1cd651ed2744bc8c7ca99a4fa40dcd562b864a6f.