While initially just trying to fix up the indentation, condense a few
lines and get rid of a goto label.
Signed-off-by: NJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>