minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-08-19 11:46:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

powerpc/85xx: fdt_set_phy_handle() should return an error code

Browse Source 
fdt_set_phy_handle() makes several FDT calls that could fail, so it should
not be hiding these errors.

Signed-off-by: Timur Tabi <timur@freescale.com>
This commit is contained in:
Timur Tabi 2012-05-04 12:21:28 +00:00 committed by Andy Fleming
parent fb365a8a96
commit 1fc0d59486
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
board/freescale/common/fman.c
View File

@ -37,31 +37,33 @@
* ... update that Ethernet node's phy-handle property to point to the * ... update that Ethernet node's phy-handle property to point to the
* ethernet-phy node. This is how we link an Ethernet node to its PHY, so each * ethernet-phy node. This is how we link an Ethernet node to its PHY, so each
* PHY in a virtual MDIO node must have an alias. * PHY in a virtual MDIO node must have an alias.
*
* Returns 0 on success, or a negative FDT error code on error.
*/ */
void fdt_set_phy_handle(void *fdt, char *compat, phys_addr_t addr, int fdt_set_phy_handle(void *fdt, char *compat, phys_addr_t addr,
const char *alias) const char *alias)
{ {
int offset, ph; int offset;
unsigned int ph;
const char *path; const char *path;
/* Get a path to the node that 'alias' points to */ /* Get a path to the node that 'alias' points to */
path = fdt_get_alias(fdt, alias); path = fdt_get_alias(fdt, alias);
if (path) { if (!path)
/* Get the offset of that node */ return -FDT_ERR_BADPATH;
int off = fdt_path_offset(fdt, path);
if (off > 0)
ph = fdt_create_phandle(fdt, off);
else
return;
} else {
return ;
}
/* failed to create a phandle */ /* Get the offset of that node */
if (ph <= 0) offset = fdt_path_offset(fdt, path);
return ; if (offset < 0)
return offset;
ph = fdt_create_phandle(fdt, offset);
if (!ph)
return -FDT_ERR_BADPHANDLE;
offset = fdt_node_offset_by_compat_reg(fdt, compat, addr); offset = fdt_node_offset_by_compat_reg(fdt, compat, addr);
if (offset > 0) if (offset < 0)
fdt_setprop(fdt, offset, "phy-handle", &ph, sizeof(ph)); return offset;
return fdt_setprop(fdt, offset, "phy-handle", &ph, sizeof(ph));
} }

2
board/freescale/common/fman.h
View File

@ -20,7 +20,7 @@
#ifndef __FMAN_BOARD_HELPER__ #ifndef __FMAN_BOARD_HELPER__
#define __FMAN_BOARD_HELPER__ #define __FMAN_BOARD_HELPER__
void fdt_set_phy_handle(void *fdt, char *compat, phys_addr_t addr, int fdt_set_phy_handle(void *fdt, char *compat, phys_addr_t addr,
const char *alias); const char *alias);
#endif #endif