Skip to content

Commit

Permalink
net: ibm: emac: replace of_get_property
Browse files Browse the repository at this point in the history
of_property_read_u32 can be used.

Signed-off-by: Rosen Penev <[email protected]>
Reviewed-by: Andrew Lunn <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
  • Loading branch information
neheb authored and kuba-moo committed Sep 14, 2024
1 parent baab9de commit cc0c92f
Showing 1 changed file with 9 additions and 11 deletions.
20 changes: 9 additions & 11 deletions drivers/net/ethernet/ibm/emac/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2444,15 +2444,14 @@ static int emac_wait_deps(struct emac_instance *dev)
static int emac_read_uint_prop(struct device_node *np, const char *name,
u32 *val, int fatal)
{
int len;
const u32 *prop = of_get_property(np, name, &len);
if (prop == NULL || len < sizeof(u32)) {
int err;

err = of_property_read_u32(np, name, val);
if (err) {
if (fatal)
printk(KERN_ERR "%pOF: missing %s property\n",
np, name);
return -ENODEV;
pr_err("%pOF: missing %s property", np, name);
return err;
}
*val = *prop;
return 0;
}

Expand Down Expand Up @@ -3301,16 +3300,15 @@ static void __init emac_make_bootlist(void)

/* Collect EMACs */
while((np = of_find_all_nodes(np)) != NULL) {
const u32 *idx;
u32 idx;

if (of_match_node(emac_match, np) == NULL)
continue;
if (of_property_read_bool(np, "unused"))
continue;
idx = of_get_property(np, "cell-index", NULL);
if (idx == NULL)
if (of_property_read_u32(np, "cell-index", &idx))
continue;
cell_indices[i] = *idx;
cell_indices[i] = idx;
emac_boot_list[i++] = of_node_get(np);
if (i >= EMAC_BOOT_LIST_SIZE) {
of_node_put(np);
Expand Down

0 comments on commit cc0c92f

Please sign in to comment.