Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

[people/ms/u-boot.git] / common / cmd_mii.c

diff --git a/common/cmd_mii.c b/common/cmd_mii.c
index 1619a2583a2923c6b50e53105c7bd610480a7cec..3ea493ba4925ef571216b24e87701a757b004cc0 100644 (file)
--- a/common/cmd_mii.c
+++ b/common/cmd_mii.c
@@ -299,12 +299,10 @@ int do_mii (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
        unsigned char   addr, reg;
        unsigned short  data;
        int             rcode = 0;
-       char            *devname;
+       const char      *devname;
 
-       if (argc < 2) {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       if (argc < 2)
+               return cmd_usage(cmdtp);
 
 #if defined(CONFIG_MII_INIT)
        mii_init ();
@@ -431,8 +429,7 @@ int do_mii (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
                else
                        miiphy_set_current_dev (argv[2]);
        } else {
-               cmd_usage(cmdtp);
-               return 1;
+               return cmd_usage(cmdtp);
        }
 
        /*