mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-17 12:41:32 +00:00
treewide: Use fdt_create_phandle() where appropriate
Replace fdt_alloc_phandle() with subsequent fdt_set_phandle() by fdt_create_phandle(). Signed-off-by: Marek Behún <marek.behun@nic.cz> Reviewed-by: Stefan Roese <sr@denx.de> Cc: Aaron Williams <awilliams@marvell.com> Cc: Ramon Fried <rfried.dev@gmail.com> Cc: Vladimir Oltean <vladimir.oltean@nxp.com>
This commit is contained in:
parent
52a26d392a
commit
68a2faa9bc
2 changed files with 6 additions and 9 deletions
|
@ -205,7 +205,7 @@ static int fdt_fix_mix(const void *fdt)
|
|||
int env_lmac = -1;
|
||||
int lmac_fdt_node = -1;
|
||||
int mix_fdt_node = -1;
|
||||
int lmac_phandle;
|
||||
unsigned int lmac_phandle;
|
||||
char *compat;
|
||||
|
||||
/* Get the lmac for this environment variable */
|
||||
|
@ -229,8 +229,7 @@ static int fdt_fix_mix(const void *fdt)
|
|||
}
|
||||
}
|
||||
|
||||
lmac_phandle = fdt_alloc_phandle((void *)fdt);
|
||||
fdt_set_phandle((void *)fdt, lmac_fdt_node, lmac_phandle);
|
||||
lmac_phandle = fdt_create_phandle((void *)fdt, lmac_fdt_node);
|
||||
|
||||
/* Get the fdt mix node corresponding to this lmac */
|
||||
mix_fdt_node = get_mix_fdt_node(fdt, env_node, env_lmac);
|
||||
|
|
|
@ -106,7 +106,7 @@ static int fdt_qportal(void *blob, int off, int id, char *name,
|
|||
enum fsl_dpaa_dev dev, int create)
|
||||
{
|
||||
int childoff, dev_off, ret = 0;
|
||||
u32 dev_handle;
|
||||
unsigned int dev_handle;
|
||||
#ifdef CONFIG_FSL_CORENET
|
||||
int num;
|
||||
u32 liodns[2];
|
||||
|
@ -142,11 +142,9 @@ static int fdt_qportal(void *blob, int off, int id, char *name,
|
|||
if (childoff > 0) {
|
||||
dev_handle = fdt_get_phandle(blob, dev_off);
|
||||
if (dev_handle <= 0) {
|
||||
dev_handle = fdt_alloc_phandle(blob);
|
||||
ret = fdt_set_phandle(blob, dev_off,
|
||||
dev_handle);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
dev_handle = fdt_create_phandle(blob, dev_off);
|
||||
if (!dev_handle)
|
||||
return -FDT_ERR_NOPHANDLES;
|
||||
}
|
||||
|
||||
ret = fdt_setprop(blob, childoff, "dev-handle",
|
||||
|
|
Loading…
Add table
Reference in a new issue