| Message ID | 20240514122232.662060-1-alexander.sverdlin@siemens.com (mailing list archive) |
|---|---|
| State | Deferred |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [1/2] net: ethernet: ti: am65-cpsw-nuss: rename phy_node -> port_np | expand |
On Tue, May 14, 2024 at 02:22:27PM +0200, A. Sverdlin wrote: > From: Alexander Sverdlin <alexander.sverdlin@siemens.com> > > Rename phy_node to port_np to better reflect what it actually is, > because the new phylink API takes netdev node (or DSA port node), > and resolves the phandle internally. > > Signed-off-by: Alexander Sverdlin <alexander.sverdlin@siemens.com> Hi Alexander, Thanks for your patches. A few minor notes on process: 1. Please provide a cover letter when posting Networking patch-sets with more than 1 patch. 2. As an enhancement - as opposed to a fix - this patch should be targeted at the net-next kernel. And it's best to explicitly note that in the subject. Subject: [PATCH net-next] ... 3. As it happens, net-next is currently closed for the v6.10 merge window. Please consider reposting as a PATCH once net-next re-opens, after 27th May. In the meantime, feel free to post new versions as you get feedback, but please switch to posting as RFC during that time. Link: https://docs.kernel.org/process/maintainer-netdev.html
diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c index 4e50b37928885..eaadf8f09c401 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -896,7 +896,7 @@ static int am65_cpsw_nuss_ndo_slave_open(struct net_device *ndev) /* mac_sl should be configured via phy-link interface */ am65_cpsw_sl_ctl_reset(port); - ret = phylink_of_phy_connect(port->slave.phylink, port->slave.phy_node, 0); + ret = phylink_of_phy_connect(port->slave.phylink, port->slave.port_np, 0); if (ret) goto error_cleanup; @@ -2611,7 +2611,7 @@ static int am65_cpsw_nuss_init_slave_ports(struct am65_cpsw_common *common) of_property_read_bool(port_np, "ti,mac-only"); /* get phy/link info */ - port->slave.phy_node = port_np; + port->slave.port_np = port_np; ret = of_get_phy_mode(port_np, &port->slave.phy_if); if (ret) { dev_err(dev, "%pOF read phy-mode err %d\n", @@ -2760,7 +2760,7 @@ am65_cpsw_nuss_init_port_ndev(struct am65_cpsw_common *common, u32 port_idx) } phylink = phylink_create(&port->slave.phylink_config, - of_node_to_fwnode(port->slave.phy_node), + of_node_to_fwnode(port->slave.port_np), port->slave.phy_if, &am65_cpsw_phylink_mac_ops); if (IS_ERR(phylink)) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.h b/drivers/net/ethernet/ti/am65-cpsw-nuss.h index d8ce88dc9c89a..e2ce2be320bd6 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.h +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.h @@ -30,7 +30,7 @@ struct am65_cpts; struct am65_cpsw_slave_data { bool mac_only; struct cpsw_sl *mac_sl; - struct device_node *phy_node; + struct device_node *port_np; phy_interface_t phy_if; struct phy *ifphy; struct phy *serdes_phy;