Rewrite a series of goto statements as a sequences of

Rewrite a series of goto statements as a sequences of
conditional expressions instead.

Use consistent return code 0/-1 for good/bad indicators.

Include one fewer file if the driver isn't used at all.

Signed-off-by: Jon Loeliger <jdl@freescale.com>