Remove some excess code:

- convert assignments to initializers;

- kill useless assignments before *return*.
Signed-off-by: NSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>