net: dsa: mv88e6xxx: remove unused .port_max_speed_mode()

The .port_max_speed_mode() method is not used anymore since commit
40da0c32c3fc ("net: dsa: mv88e6xxx: remove handling for DSA and CPU ports").
Drop it.

Signed-off-by: Marek Behún <kabel@kernel.org>
Reviewed-by: Alexander Lobakin <aleksander.lobakin@intel.com>
Link: https://patch.msgid.link/20260504152653.1389394-1-kabel@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 8ca5fd40df92eff3dc556a6f1f01d5ce6a4f3e88..c618abc75ebbcfc511307a75d8b8d00039d5e397 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -4434,7 +4434,6 @@ static const struct mv88e6xxx_ops mv88e6141_ops = {
        .port_sync_link = mv88e6xxx_port_sync_link,
        .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,
        .port_set_speed_duplex = mv88e6341_port_set_speed_duplex,
-       .port_max_speed_mode = mv88e6341_port_max_speed_mode,
        .port_tag_remap = mv88e6095_port_tag_remap,
        .port_set_policy = mv88e6352_port_set_policy,
        .port_set_frame_mode = mv88e6351_port_set_frame_mode,
@@ -4826,7 +4825,6 @@ static const struct mv88e6xxx_ops mv88e6190_ops = {
        .port_sync_link = mv88e6xxx_port_sync_link,
        .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,
        .port_set_speed_duplex = mv88e6390_port_set_speed_duplex,
-       .port_max_speed_mode = mv88e6390_port_max_speed_mode,
        .port_tag_remap = mv88e6390_port_tag_remap,
        .port_set_policy = mv88e6352_port_set_policy,
        .port_set_frame_mode = mv88e6351_port_set_frame_mode,
@@ -4886,7 +4884,6 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = {
        .port_sync_link = mv88e6xxx_port_sync_link,
        .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,
        .port_set_speed_duplex = mv88e6390x_port_set_speed_duplex,
-       .port_max_speed_mode = mv88e6390x_port_max_speed_mode,
        .port_tag_remap = mv88e6390_port_tag_remap,
        .port_set_policy = mv88e6352_port_set_policy,
        .port_set_frame_mode = mv88e6351_port_set_frame_mode,
@@ -4946,7 +4943,6 @@ static const struct mv88e6xxx_ops mv88e6191_ops = {
        .port_sync_link = mv88e6xxx_port_sync_link,
        .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,
        .port_set_speed_duplex = mv88e6390_port_set_speed_duplex,
-       .port_max_speed_mode = mv88e6390_port_max_speed_mode,
        .port_tag_remap = mv88e6390_port_tag_remap,
        .port_set_frame_mode = mv88e6351_port_set_frame_mode,
        .port_set_ucast_flood = mv88e6352_port_set_ucast_flood,
@@ -5110,7 +5106,6 @@ static const struct mv88e6xxx_ops mv88e6290_ops = {
        .port_sync_link = mv88e6xxx_port_sync_link,
        .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,
        .port_set_speed_duplex = mv88e6390_port_set_speed_duplex,
-       .port_max_speed_mode = mv88e6390_port_max_speed_mode,
        .port_tag_remap = mv88e6390_port_tag_remap,
        .port_set_policy = mv88e6352_port_set_policy,
        .port_set_frame_mode = mv88e6351_port_set_frame_mode,
@@ -5278,7 +5273,6 @@ static const struct mv88e6xxx_ops mv88e6341_ops = {
        .port_sync_link = mv88e6xxx_port_sync_link,
        .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,
        .port_set_speed_duplex = mv88e6341_port_set_speed_duplex,
-       .port_max_speed_mode = mv88e6341_port_max_speed_mode,
        .port_tag_remap = mv88e6095_port_tag_remap,
        .port_set_policy = mv88e6352_port_set_policy,
        .port_set_frame_mode = mv88e6351_port_set_frame_mode,
@@ -5499,7 +5493,6 @@ static const struct mv88e6xxx_ops mv88e6390_ops = {
        .port_sync_link = mv88e6xxx_port_sync_link,
        .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,
        .port_set_speed_duplex = mv88e6390_port_set_speed_duplex,
-       .port_max_speed_mode = mv88e6390_port_max_speed_mode,
        .port_tag_remap = mv88e6390_port_tag_remap,
        .port_set_policy = mv88e6352_port_set_policy,
        .port_set_frame_mode = mv88e6351_port_set_frame_mode,
@@ -5564,7 +5557,6 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = {
        .port_sync_link = mv88e6xxx_port_sync_link,
        .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,
        .port_set_speed_duplex = mv88e6390x_port_set_speed_duplex,
-       .port_max_speed_mode = mv88e6390x_port_max_speed_mode,
        .port_tag_remap = mv88e6390_port_tag_remap,
        .port_set_policy = mv88e6352_port_set_policy,
        .port_set_frame_mode = mv88e6351_port_set_frame_mode,
@@ -5627,7 +5619,6 @@ static const struct mv88e6xxx_ops mv88e6393x_ops = {
        .port_sync_link = mv88e6xxx_port_sync_link,
        .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,
        .port_set_speed_duplex = mv88e6393x_port_set_speed_duplex,
-       .port_max_speed_mode = mv88e6393x_port_max_speed_mode,
        .port_tag_remap = mv88e6390_port_tag_remap,
        .port_set_policy = mv88e6393x_port_set_policy,
        .port_set_frame_mode = mv88e6351_port_set_frame_mode,

diff --git a/drivers/net/dsa/mv88e6xxx/chip.h b/drivers/net/dsa/mv88e6xxx/chip.h
index 2b235ac2c5df5749bf4ff683273c455662935537..4339f6810535e31df4d40c6e6ff3ae11d6875560 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.h
+++ b/drivers/net/dsa/mv88e6xxx/chip.h
@@ -585,10 +585,6 @@ struct mv88e6xxx_ops {
        int (*port_set_speed_duplex)(struct mv88e6xxx_chip *chip, int port,
                                     int speed, int duplex);
 
-       /* What interface mode should be used for maximum speed? */
-       phy_interface_t (*port_max_speed_mode)(struct mv88e6xxx_chip *chip,
-                                              int port);
-
        int (*port_tag_remap)(struct mv88e6xxx_chip *chip, int port);
 
        int (*port_set_policy)(struct mv88e6xxx_chip *chip, int port,

diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c
index 49cd82930b7a5e6c8efcf18358aa03676661c723..74cfc0bb7b5be282fa00a6d42bbbcb301a015e3b 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/port.c
+++ b/drivers/net/dsa/mv88e6xxx/port.c
@@ -344,15 +344,6 @@ int mv88e6341_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,
                                               duplex);
 }
 
-phy_interface_t mv88e6341_port_max_speed_mode(struct mv88e6xxx_chip *chip,
-                                             int port)
-{
-       if (port == 5)
-               return PHY_INTERFACE_MODE_2500BASEX;
-
-       return PHY_INTERFACE_MODE_NA;
-}
-
 /* Support 10, 100, 200, 1000 Mbps (e.g. 88E6352 family) */
 int mv88e6352_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,
                                    int speed, int duplex)
@@ -384,15 +375,6 @@ int mv88e6390_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,
                                               duplex);
 }
 
-phy_interface_t mv88e6390_port_max_speed_mode(struct mv88e6xxx_chip *chip,
-                                             int port)
-{
-       if (port == 9 || port == 10)
-               return PHY_INTERFACE_MODE_2500BASEX;
-
-       return PHY_INTERFACE_MODE_NA;
-}
-
 /* Support 10, 100, 200, 1000, 2500, 10000 Mbps (e.g. 88E6190X) */
 int mv88e6390x_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,
                                     int speed, int duplex)
@@ -407,15 +389,6 @@ int mv88e6390x_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,
                                               duplex);
 }
 
-phy_interface_t mv88e6390x_port_max_speed_mode(struct mv88e6xxx_chip *chip,
-                                              int port)
-{
-       if (port == 9 || port == 10)
-               return PHY_INTERFACE_MODE_XAUI;
-
-       return PHY_INTERFACE_MODE_NA;
-}
-
 /* Support 10, 100, 200, 1000, 2500, 5000, 10000 Mbps (e.g. 88E6393X)
  * Function mv88e6xxx_port_set_speed_duplex() can't be used as the register
  * values for speeds 2500 & 5000 conflict.
@@ -509,19 +482,6 @@ int mv88e6393x_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,
        return 0;
 }
 
-phy_interface_t mv88e6393x_port_max_speed_mode(struct mv88e6xxx_chip *chip,
-                                              int port)
-{
-
-       if (port != 0 && port != 9 && port != 10)
-               return PHY_INTERFACE_MODE_NA;
-
-       if (chip->info->prod_num == MV88E6XXX_PORT_SWITCH_ID_PROD_6361)
-               return PHY_INTERFACE_MODE_2500BASEX;
-
-       return PHY_INTERFACE_MODE_10GBASER;
-}
-
 static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port,
                                    phy_interface_t mode, bool force)
 {

diff --git a/drivers/net/dsa/mv88e6xxx/port.h b/drivers/net/dsa/mv88e6xxx/port.h
index a2492cf4d920fb228b89e7d9dcc972d6a97c4e3a..44b100dd618bd8429159efbdeda7468f9e14f397 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/port.h
+++ b/drivers/net/dsa/mv88e6xxx/port.h
@@ -504,15 +504,6 @@ int mv88e6390x_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,
 int mv88e6393x_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,
                                     int speed, int duplex);
 
-phy_interface_t mv88e6341_port_max_speed_mode(struct mv88e6xxx_chip *chip,
-                                             int port);
-phy_interface_t mv88e6390_port_max_speed_mode(struct mv88e6xxx_chip *chip,
-                                             int port);
-phy_interface_t mv88e6390x_port_max_speed_mode(struct mv88e6xxx_chip *chip,
-                                              int port);
-phy_interface_t mv88e6393x_port_max_speed_mode(struct mv88e6xxx_chip *chip,
-                                              int port);
-
 int mv88e6xxx_port_set_state(struct mv88e6xxx_chip *chip, int port, u8 state);
 
 int mv88e6xxx_port_set_vlan_map(struct mv88e6xxx_chip *chip, int port, u16 map);