Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-24 22:36:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

serial: remove calls to serial_assign()

Browse source 
Remove calls to serial_assign() that are failing now that it returns a
proper error code.  This calls were not actually doing anything
because they passed the name of a stdio_dev when a serial_device name
is exptectd.

Signed-off-by: Allen Martin <amartin@nvidia.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Marek Vasut <marex@denx.de>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Tested-by: Stephen Warren <swarren@nvidia.com>
This commit is contained in:
Allen Martin 2012-10-25 13:30:14 +00:00 • committed by Tom Rini
parent 5e8f98319d
commit 8440f18a48
2 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/cmd_nvedit.c
View file

@ -238,9 +238,6 @@ int env_check_apply(const char *name, const char *oldval,
/* Try assigning specified device */ /* Try assigning specified device */
if (console_assign(console, newval) < 0) if (console_assign(console, newval) < 0)
return 1; return 1;
if (serial_assign(newval) < 0)
return 1;
#endif /* CONFIG_CONSOLE_MUX */ #endif /* CONFIG_CONSOLE_MUX */
} }

10
common/iomux.c
View file

@ -135,16 +135,6 @@ int iomux_doenv(const int console, const char *arg)
*/ */
if (console_assign(console, start[j]) < 0) if (console_assign(console, start[j]) < 0)
continue; continue;
/*
* This was taken from common/cmd_nvedit.c.
* This will never work because serial_assign() returns
* 1 upon error, not -1.
* This would almost always return an error anyway because
* serial_assign() expects the name of a serial device, like
* serial_smc, but the user generally only wants to set serial.
*/
if (serial_assign(start[j]) < 0)
continue;
cons_set[cs_idx++] = dev; cons_set[cs_idx++] = dev;
} }
free(console_args); free(console_args);