serial: Reorder get_current()

Reorder the get_current() function to make it a bit more readable.
The code does not grow and there is minor change in the code logic,
where dev != NULL is now checked in any case.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Tom Rini <trini@ti.com>
master
Marek Vasut 12 years ago committed by Tom Rini
parent 6d93e25806
commit dee1941604
  1. 21
      drivers/serial/serial.c

@ -227,20 +227,23 @@ static struct serial_device *get_current(void)
{
struct serial_device *dev;
if (!(gd->flags & GD_FLG_RELOC) || !serial_current) {
if (!(gd->flags & GD_FLG_RELOC))
dev = default_serial_console();
else if (!serial_current)
dev = default_serial_console();
else
dev = serial_current;
/* We must have a console device */
if (!dev) {
/* We must have a console device */
if (!dev) {
#ifdef CONFIG_SPL_BUILD
puts("Cannot find console\n");
hang();
puts("Cannot find console\n");
hang();
#else
panic("Cannot find console\n");
panic("Cannot find console\n");
#endif
}
} else
dev = serial_current;
}
return dev;
}

Loading…
Cancel
Save