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>

diff --git a/drivers/net/pcs/pcs-xpcs.c b/drivers/net/pcs/pcs-xpcs.c
index 2d8cc3959b4c1a67d16348878aafe68d5203119b..8765b01c0b5d2c1d49f7972afceb9af9b9449c4b 100644 (file)
--- 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;