...in preparation for further cleanups from Estelle Hammache which
will need to call it from elsewhere.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>