From: Rosen Penev <rosenp@gmail.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com, linux-kernel@vger.kernel.org,
jacob.e.keller@intel.com, horms@kernel.org, sd@queasysnail.net,
chunkeey@gmail.com
Subject: [PATCHv3 net-next 7/9] net: ibm: emac: replace of_get_property
Date: Thu, 5 Sep 2024 13:15:04 -0700 [thread overview]
Message-ID: <20240905201506.12679-8-rosenp@gmail.com> (raw)
In-Reply-To: <20240905201506.12679-1-rosenp@gmail.com>
of_property_read_u32 can be used.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
drivers/net/ethernet/ibm/emac/core.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c
index cda368701ae4..f4126a1f1fff 100644
--- a/drivers/net/ethernet/ibm/emac/core.c
+++ b/drivers/net/ethernet/ibm/emac/core.c
@@ -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;
}
@@ -3298,16 +3297,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);
--
2.46.0
next prev parent reply other threads:[~2024-09-05 20:15 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-05 20:14 [PATCHv3 net-next 0/9] net: ibm: emac: modernize a bit Rosen Penev
2024-09-05 20:14 ` [PATCHv3 net-next 1/9] net: ibm: emac: use devm for alloc_etherdev Rosen Penev
2024-09-05 21:16 ` Andrew Lunn
2024-09-05 20:14 ` [PATCHv3 net-next 2/9] net: ibm: emac: manage emac_irq with devm Rosen Penev
2024-09-05 21:17 ` Andrew Lunn
2024-09-05 20:15 ` [PATCHv3 net-next 3/9] net: ibm: emac: use devm for of_iomap Rosen Penev
2024-09-05 21:17 ` Andrew Lunn
2024-09-05 20:15 ` [PATCHv3 net-next 4/9] net: ibm: emac: remove mii_bus with devm Rosen Penev
2024-09-05 21:19 ` Andrew Lunn
2024-09-05 20:15 ` [PATCHv3 net-next 5/9] net: ibm: emac: use devm for register_netdev Rosen Penev
2024-09-05 21:19 ` Andrew Lunn
2024-09-05 20:15 ` [PATCHv3 net-next 6/9] net: ibm: emac: use netdev's phydev directly Rosen Penev
2024-09-05 21:21 ` Andrew Lunn
2024-09-07 19:32 ` Christophe JAILLET
2024-09-07 19:58 ` Rosen Penev
2024-09-05 20:15 ` Rosen Penev [this message]
2024-09-05 21:22 ` [PATCHv3 net-next 7/9] net: ibm: emac: replace of_get_property Andrew Lunn
2024-09-05 20:15 ` [PATCHv3 net-next 8/9] net: ibm: emac: remove all waiting code Rosen Penev
2024-09-05 20:15 ` [PATCHv3 net-next 9/9] net: ibm: emac: get rid of wol_irq Rosen Penev
2024-09-05 21:27 ` Andrew Lunn
2024-09-05 22:28 ` Rosen Penev
2024-09-07 18:29 ` kernel test robot
2024-09-07 23:11 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240905201506.12679-8-rosenp@gmail.com \
--to=rosenp@gmail.com \
--cc=chunkeey@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=jacob.e.keller@intel.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sd@queasysnail.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.