ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c
authorHugo Villeneuve <hugo.villeneuve@lyrtech.com>
Fri, 12 Sep 2008 00:20:47 +0000 (02:20 +0200)
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Fri, 12 Sep 2008 00:20:47 +0000 (02:20 +0200)
ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c

Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com>
cpu/arm926ejs/davinci/dp83848.c

index 59f039b..c71c685 100644 (file)
@@ -64,29 +64,16 @@ int dp83848_get_link_speed(int phy_addr)
                return(0);
 
        /* Speed doesn't matter, there is no setting for it in EMAC... */
-       if (tmp & DP83848_SPEED) {
-               if (tmp & DP83848_DUPLEX) {
-                       /* set DM644x EMAC for Full Duplex  */
-                       emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE | EMAC_MACCONTROL_FULLDUPLEX_ENABLE;
-               } else {
-                       /*set DM644x EMAC for Half Duplex  */
-                       emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE;
-               }
-
-               return(1);
+       if (tmp & DP83848_DUPLEX) {
+               /* set DM644x EMAC for Full Duplex  */
+               emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE |
+                       EMAC_MACCONTROL_FULLDUPLEX_ENABLE;
        } else {
-               if (tmp & DP83848_DUPLEX) {
-                       /* set DM644x EMAC for Full Duplex  */
-                       emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE | EMAC_MACCONTROL_FULLDUPLEX_ENABLE;
-               } else {
-                       /*set DM644x EMAC for Half Duplex  */
-                       emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE;
-               }
-
-               return(1);
+               /*set DM644x EMAC for Half Duplex  */
+               emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE;
        }
 
-       return(0);
+       return(1);
 }