net: mtk_eth_soc: remove unnecessary checks in mtk_mac_config()

mtk_mac_config() checks that the interface mode is permitted for the
capabilities, but we already do these checks in mtk_add_mac() when
initialising phylink's supported_interfaces bitmap. Remove the
unnecessary tests.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 1b385dfe620f3fa1def2baf41a166a46e25c9c9a..f78810717f66f6e53bbf1ad017abcf5b65d5883e 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -458,12 +458,6 @@ static void mtk_mac_config(struct phylink_config *config, unsigned int mode,
                /* Setup soc pin functions */
                switch (state->interface) {
                case PHY_INTERFACE_MODE_TRGMII:
-                       if (mac->id)
-                               goto err_phy;
-                       if (!MTK_HAS_CAPS(mac->hw->soc->caps,
-                                         MTK_GMAC1_TRGMII))
-                               goto err_phy;
-                       fallthrough;
                case PHY_INTERFACE_MODE_RGMII_TXID:
                case PHY_INTERFACE_MODE_RGMII_RXID:
                case PHY_INTERFACE_MODE_RGMII_ID:
@@ -480,11 +474,9 @@ static void mtk_mac_config(struct phylink_config *config, unsigned int mode,
                case PHY_INTERFACE_MODE_1000BASEX:
                case PHY_INTERFACE_MODE_2500BASEX:
                case PHY_INTERFACE_MODE_SGMII:
-                       if (MTK_HAS_CAPS(eth->soc->caps, MTK_SGMII)) {
-                               err = mtk_gmac_sgmii_path_setup(eth, mac->id);
-                               if (err)
-                                       goto init_err;
-                       }
+                       err = mtk_gmac_sgmii_path_setup(eth, mac->id);
+                       if (err)
+                               goto init_err;
                        break;
                case PHY_INTERFACE_MODE_GMII:
                        if (MTK_HAS_CAPS(eth->soc->caps, MTK_GEPHY)) {