net: dsa: remove mac_prepare()/mac_finish() shims

No DSA driver makes use of the mac_prepare()/mac_finish() shimmed
operations anymore, so we can remove these.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://lore.kernel.org/r/E1sByNx-00ELW1-Vp@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/net/dsa.h b/include/net/dsa.h
index b60e7e410aba78321d2e5e0ed446be1286146989..f9ae3ca66b6f19792749367599103244b063c8da 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -882,15 +882,9 @@ struct dsa_switch_ops {
        struct phylink_pcs *(*phylink_mac_select_pcs)(struct dsa_switch *ds,
                                                      int port,
                                                      phy_interface_t iface);
-       int     (*phylink_mac_prepare)(struct dsa_switch *ds, int port,
-                                      unsigned int mode,
-                                      phy_interface_t interface);
        void    (*phylink_mac_config)(struct dsa_switch *ds, int port,
                                      unsigned int mode,
                                      const struct phylink_link_state *state);
-       int     (*phylink_mac_finish)(struct dsa_switch *ds, int port,
-                                     unsigned int mode,
-                                     phy_interface_t interface);
        void    (*phylink_mac_link_down)(struct dsa_switch *ds, int port,
                                         unsigned int mode,
                                         phy_interface_t interface);

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 12521a7d404810c7399e3f8c0baa408f0a8a4b8b..668c729946ea676591a641e9a87e9b2277e07819 100644 (file)
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -1507,9 +1507,7 @@ static int dsa_switch_probe(struct dsa_switch *ds)
 
        if (ds->phylink_mac_ops) {
                if (ds->ops->phylink_mac_select_pcs ||
-                   ds->ops->phylink_mac_prepare ||
                    ds->ops->phylink_mac_config ||
-                   ds->ops->phylink_mac_finish ||
                    ds->ops->phylink_mac_link_down ||
                    ds->ops->phylink_mac_link_up)
                        return -EINVAL;

diff --git a/net/dsa/port.c b/net/dsa/port.c
index 9a249d4ac3a5d9dffb0e7fa899ed71e5499deb22..e23db9507546b14303ba45d473f51221daeb829a 100644 (file)
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -1549,21 +1549,6 @@ dsa_port_phylink_mac_select_pcs(struct phylink_config *config,
        return pcs;
 }
 
-static int dsa_port_phylink_mac_prepare(struct phylink_config *config,
-                                       unsigned int mode,
-                                       phy_interface_t interface)
-{
-       struct dsa_port *dp = dsa_phylink_to_port(config);
-       struct dsa_switch *ds = dp->ds;
-       int err = 0;
-
-       if (ds->ops->phylink_mac_prepare)
-               err = ds->ops->phylink_mac_prepare(ds, dp->index, mode,
-                                                  interface);
-
-       return err;
-}
-
 static void dsa_port_phylink_mac_config(struct phylink_config *config,
                                        unsigned int mode,
                                        const struct phylink_link_state *state)
@@ -1577,21 +1562,6 @@ static void dsa_port_phylink_mac_config(struct phylink_config *config,
        ds->ops->phylink_mac_config(ds, dp->index, mode, state);
 }
 
-static int dsa_port_phylink_mac_finish(struct phylink_config *config,
-                                      unsigned int mode,
-                                      phy_interface_t interface)
-{
-       struct dsa_port *dp = dsa_phylink_to_port(config);
-       struct dsa_switch *ds = dp->ds;
-       int err = 0;
-
-       if (ds->ops->phylink_mac_finish)
-               err = ds->ops->phylink_mac_finish(ds, dp->index, mode,
-                                                 interface);
-
-       return err;
-}
-
 static void dsa_port_phylink_mac_link_down(struct phylink_config *config,
                                           unsigned int mode,
                                           phy_interface_t interface)
@@ -1624,9 +1594,7 @@ static void dsa_port_phylink_mac_link_up(struct phylink_config *config,
 
 static const struct phylink_mac_ops dsa_port_phylink_mac_ops = {
        .mac_select_pcs = dsa_port_phylink_mac_select_pcs,
-       .mac_prepare = dsa_port_phylink_mac_prepare,
        .mac_config = dsa_port_phylink_mac_config,
-       .mac_finish = dsa_port_phylink_mac_finish,
        .mac_link_down = dsa_port_phylink_mac_link_down,
        .mac_link_up = dsa_port_phylink_mac_link_up,
 };