UEFI: Tidy up compilation errors to devices.cpp