Simplify a trivial if-return sequence.  Possibly combine with a preceding
function call.

Generated by: scripts/coccinelle/misc/simple_return.cocci
Signed-off-by: NQuentin Lambert <lambert.quentin@gmail.com>
Signed-off-by: NBjorn Helgaas <bhelgaas@google.com>