net: dsa: bcm_sf2: Remove special handling of "internal" phy-mode
authorFlorian Fainelli <f.fainelli@gmail.com>
Fri, 23 Jun 2017 17:33:16 +0000 (10:33 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 23 Jun 2017 19:06:43 +0000 (15:06 -0400)
The PHY library now supports an "internal" phy-mode, thus making our
custom parsing code now unnecessary.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dsa/bcm_sf2.c

index 76e98e8ed315a19bf970800fefac95a386bb4186..648f91b58d1e260a71de7db12dc39627bc40a35c 100644 (file)
@@ -498,10 +498,8 @@ static void bcm_sf2_identify_ports(struct bcm_sf2_priv *priv,
                                   struct device_node *dn)
 {
        struct device_node *port;
-       const char *phy_mode_str;
        int mode;
        unsigned int port_num;
-       int ret;
 
        priv->moca_port = -1;
 
@@ -515,15 +513,11 @@ static void bcm_sf2_identify_ports(struct bcm_sf2_priv *priv,
                 * time
                 */
                mode = of_get_phy_mode(port);
-               if (mode < 0) {
-                       ret = of_property_read_string(port, "phy-mode",
-                                                     &phy_mode_str);
-                       if (ret < 0)
-                               continue;
-
-                       if (!strcasecmp(phy_mode_str, "internal"))
-                               priv->int_phy_mask |= 1 << port_num;
-               }
+               if (mode < 0)
+                       continue;
+
+               if (mode == PHY_INTERFACE_MODE_INTERNAL)
+                       priv->int_phy_mask |= 1 << port_num;
 
                if (mode == PHY_INTERFACE_MODE_MOCA)
                        priv->moca_port = port_num;