Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

serial-uclass: drop redundant code in serial_check_stdout()

Browse source 
As the updated comment says, this is already handled by
fdt_path_offset_namelen() itself.

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
This commit is contained in:
Rasmus Villemoes 2023-03-29 09:57:51 +02:00 committed by Tom Rini
parent fa3f0cbe13
commit f3bb055ecb
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/serial/serial-uclass.c
View file

@ -31,7 +31,7 @@ static const unsigned long baudrate_table[] = CFG_SYS_BAUDRATE_TABLE;
static int serial_check_stdout(const void *blob, struct udevice **devp) static int serial_check_stdout(const void *blob, struct udevice **devp)
{ {
int node = -1; int node = -1;
const char *str, *p, *name; const char *str, *p;
int namelen; int namelen;
/* Check for a chosen console */ /* Check for a chosen console */
@ -39,20 +39,16 @@ static int serial_check_stdout(const void *blob, struct udevice **devp)
if (str) { if (str) {
p = strchr(str, ':'); p = strchr(str, ':');
namelen = p ? p - str : strlen(str); namelen = p ? p - str : strlen(str);
/*
* This also deals with things like
*
* stdout-path = "serial0:115200n8";
*
* since fdt_path_offset_namelen() treats a str not
* beginning with '/' as an alias and thus applies
* fdt_get_alias_namelen() to it.
*/
node = fdt_path_offset_namelen(blob, str, namelen); node = fdt_path_offset_namelen(blob, str, namelen);
if (node < 0) {
/*
* Deal with things like
* stdout-path = "serial0:115200n8";
*
* We need to look up the alias and then follow it to
* the correct node.
*/
name = fdt_get_alias_namelen(blob, str, namelen);
if (name)
node = fdt_path_offset(blob, name);
}
} }
if (node < 0) if (node < 0)