Commit cc0c92ff authored by Rosen Penev's avatar Rosen Penev Committed by Jakub Kicinski
Browse files

net: ibm: emac: replace of_get_property 



of_property_read_u32 can be used.

Signed-off-by: default avatarRosen Penev <rosenp@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20240912024903.6201-8-rosenp@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent baab9de3

drivers/net/ethernet/ibm/emac/core.c

+9 −11
Original line number Diff line number Diff line
@@ -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;

}
@@ -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);