Re-organize the firmware handling code and declarations a bit to make
the code more compact.
Signed-off-by: NMichael Chan <mchan@broadcom.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>