Use this new function in places where it simplifies the code.

Signed-off-by: Simon Glass <sjg@chromium.org>