Merge git://git.denx.de/u-boot-mpc85xx

[karo-tx-uboot.git] / drivers / net / fm / t1040.c

diff --git a/drivers/net/fm/t1040.c b/drivers/net/fm/t1040.c
index bcc871d8420f7abbf4f954f3c6fa0525d26d9d46..d2a097e0e55d0facd9ed1e1e290f27cc60a4cb09 100644 (file)
--- a/drivers/net/fm/t1040.c
+++ b/drivers/net/fm/t1040.c
@@ -25,8 +25,6 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
                else if ((rcwsr13 & FSL_CORENET_RCWSR13_EC1) ==
                                FSL_CORENET_RCWSR13_EC1_FM1_DTSEC4_MII)
                        return PHY_INTERFACE_MODE_MII;
-               else
-                       return PHY_INTERFACE_MODE_NONE;
        }
 
        if ((port == FM1_DTSEC4) &&
@@ -38,8 +36,6 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
                else if ((rcwsr13 & FSL_CORENET_RCWSR13_EC1) ==
                                FSL_CORENET_RCWSR13_EC1_FM1_DTSEC4_MII)
                        return PHY_INTERFACE_MODE_MII;
-               else
-                       return PHY_INTERFACE_MODE_NONE;
        }
 
        if (port == FM1_DTSEC5) {
@@ -49,8 +45,6 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
                else if ((rcwsr13 & FSL_CORENET_RCWSR13_EC2) ==
                                FSL_CORENET_RCWSR13_EC2_FM1_DTSEC5_MII)
                        return PHY_INTERFACE_MODE_MII;
-               else
-                       return PHY_INTERFACE_MODE_NONE;
        }
 
        switch (port) {