EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe

From: Vladimir Oltean <vladimir.oltean@nxp.com>

The Felix driver is now using its own PHYLINK instance, not calling into
ocelot_adjust_link. So the port_pcs_init function pointer is an
unnecessary indirection. Remove it.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
drivers/net/ethernet/mscc/ocelot.c       | 19 +++++++++++++++++--
drivers/net/ethernet/mscc/ocelot_board.c | 24 ------------------------
include/soc/mscc/ocelot.h                |  3 ---
3 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index 3de8267180e2..2fc10b89bbcb 100644
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c

@@ -442,8 +442,23 @@ void ocelot_adjust_link(struct ocelot *ocelot, int port,
       ocelot_port_writel(ocelot_port, DEV_MAC_MODE_CFG_FDX_ENA |
                          mode, DEV_MAC_MODE_CFG);

-       if (ocelot->ops->pcs_init)
-               ocelot->ops->pcs_init(ocelot, port);
+       /* Disable HDX fast control */
+       ocelot_port_writel(ocelot_port, DEV_PORT_MISC_HDX_FAST_DIS,
+                          DEV_PORT_MISC);
+
+       /* SGMII only for now */
+       ocelot_port_writel(ocelot_port, PCS1G_MODE_CFG_SGMII_MODE_ENA,
+                          PCS1G_MODE_CFG);
+       ocelot_port_writel(ocelot_port, PCS1G_SD_CFG_SD_SEL, PCS1G_SD_CFG);
+
+       /* Enable PCS */
+       ocelot_port_writel(ocelot_port, PCS1G_CFG_PCS_ENA, PCS1G_CFG);
+
+       /* No aneg on SGMII */
+       ocelot_port_writel(ocelot_port, 0, PCS1G_ANEG_CFG);
+
+       /* No loopback */
+       ocelot_port_writel(ocelot_port, 0, PCS1G_LB_CFG);

       /* Enable MAC module */
       ocelot_port_writel(ocelot_port, DEV_MAC_ENA_CFG_RX_ENA |

diff --git a/drivers/net/ethernet/mscc/ocelot_board.c b/drivers/net/ethernet/mscc/ocelot_board.c
index 8b83a10083e2..5e21d0cc8335 100644
--- a/drivers/net/ethernet/mscc/ocelot_board.c
+++ b/drivers/net/ethernet/mscc/ocelot_board.c

@@ -212,29 +212,6 @@ static const struct of_device_id mscc_ocelot_match[] = {

};
MODULE_DEVICE_TABLE(of, mscc_ocelot_match);

-static void ocelot_port_pcs_init(struct ocelot *ocelot, int port)
-{
-       struct ocelot_port *ocelot_port = ocelot->ports[port];
-
-       /* Disable HDX fast control */
-       ocelot_port_writel(ocelot_port, DEV_PORT_MISC_HDX_FAST_DIS,
-                          DEV_PORT_MISC);
-
-       /* SGMII only for now */
-       ocelot_port_writel(ocelot_port, PCS1G_MODE_CFG_SGMII_MODE_ENA,
-                          PCS1G_MODE_CFG);
-       ocelot_port_writel(ocelot_port, PCS1G_SD_CFG_SD_SEL, PCS1G_SD_CFG);
-
-       /* Enable PCS */
-       ocelot_port_writel(ocelot_port, PCS1G_CFG_PCS_ENA, PCS1G_CFG);
-
-       /* No aneg on SGMII */
-       ocelot_port_writel(ocelot_port, 0, PCS1G_ANEG_CFG);
-
-       /* No loopback */
-       ocelot_port_writel(ocelot_port, 0, PCS1G_LB_CFG);
-}
-
static int ocelot_reset(struct ocelot *ocelot)
{
       int retries = 100;

@@ -259,7 +236,6 @@ static int ocelot_reset(struct ocelot *ocelot)

}

static const struct ocelot_ops ocelot_ops = {
-       .pcs_init               = ocelot_port_pcs_init,
       .reset                  = ocelot_reset,
};

diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h
index f63266a4ca70..31bcbc1ab2f9 100644
--- a/include/soc/mscc/ocelot.h
+++ b/include/soc/mscc/ocelot.h

@@ -402,7 +402,6 @@ enum ocelot_tag_prefix {

struct ocelot;

struct ocelot_ops {
-       void (*pcs_init)(struct ocelot *ocelot, int port);
       int (*reset)(struct ocelot *ocelot);
};

@@ -479,8 +478,6 @@ struct ocelot {
       struct mutex                    ptp_lock;
       /* Protects the PTP clock */
       spinlock_t                      ptp_clock_lock;
-
-       void (*port_pcs_init)(struct ocelot_port *port);

};

#define ocelot_read_ix(ocelot, reg, gi, ri) __ocelot_read_ix(ocelot, reg, reg##_GSZ * (gi) + reg##_RSZ * (ri))
--
2.17.1