The first patch fixes a corner case where a whole tree of devices is removed and I got a report of a live lock The second patch just modernizes to new helpers. No functional change intended v2: reversed order of patches so the first patch can cleanly go into the stable series Signed-off-by: Oliver Neukum <oneukum@xxxxxxxx>
