Fixed some minor code style issues and also removed some
assignments inside of if conditionals.
Signed-off-by: NKyle Chamberlin <kylechamberlin@project20million.org>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>