Use deactivateDevice() instead of removeDevice() directly. This will make sure for device deletion, deferred removal is used if user has configured it in. Also this makes reading code litle easier as there is single function to remove a device and that is deactivateDevice(). Signed-off-by: Vivek Goyal <vgoyal@redhat.com> Upstream-commit: 39081eb3aa8f715c1da6f798c6531efd7a8a494c Component: engine