diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-10-01 17:04:21 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-10-02 17:32:00 -0700 |
| commit | a487c9e7cfc4fe7a35874326e6840f6528110f58 (patch) | |
| tree | b0f4879b1b9279adf43b791823cac0f528486782 | |
| parent | 92fb8986083afa1a769299ded1621ac490aaeb73 (diff) | |
| download | lwn-a487c9e7cfc4fe7a35874326e6840f6528110f58.tar.gz lwn-a487c9e7cfc4fe7a35874326e6840f6528110f58.zip | |
net: pcs: xpcs: get rid of xpcs_init_iface()
xpcs_init_iface() no longer does anything with the interface mode, and
now merely does configuration related to the PMA ID. Move this back
into xpcs_create() as it doesn't warrant being a separate function
anymore.
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1svfML-005ZIF-84@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | drivers/net/pcs/pcs-xpcs.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/drivers/net/pcs/pcs-xpcs.c b/drivers/net/pcs/pcs-xpcs.c index 2d8cc3959b4c..8765b01c0b5d 100644 --- a/drivers/net/pcs/pcs-xpcs.c +++ b/drivers/net/pcs/pcs-xpcs.c @@ -1483,16 +1483,6 @@ static int xpcs_init_id(struct dw_xpcs *xpcs) return 0; } -static int xpcs_init_iface(struct dw_xpcs *xpcs) -{ - if (xpcs->info.pma == WX_TXGBE_XPCS_PMA_10G_ID) - xpcs->pcs.poll = false; - else - xpcs->need_reset = true; - - return 0; -} - static struct dw_xpcs *xpcs_create(struct mdio_device *mdiodev) { struct dw_xpcs *xpcs; @@ -1510,9 +1500,10 @@ static struct dw_xpcs *xpcs_create(struct mdio_device *mdiodev) if (ret) goto out_clear_clks; - ret = xpcs_init_iface(xpcs); - if (ret) - goto out_clear_clks; + if (xpcs->info.pma == WX_TXGBE_XPCS_PMA_10G_ID) + xpcs->pcs.poll = false; + else + xpcs->need_reset = true; return xpcs; |