Clean up the code a bit to initialize the variables directly when
defining them.
Signed-off-by: NEmilio López <emilio@elopez.com.ar>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>