arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README

[karo-tx-uboot.git] / common / cmd_mdio.c

diff --git a/common/cmd_mdio.c b/common/cmd_mdio.c
index cac070308969662e2794acbfbe3606f44af23e49..ff0063b30d157a01cbb5f81a1cf5d6f53d3e2c52 100644 (file)
--- a/common/cmd_mdio.c
+++ b/common/cmd_mdio.c
@@ -57,9 +57,9 @@ static int extract_range(char *input, int *plo, int *phi)
        return 0;
 }
 
-int mdio_write_ranges(struct mii_dev *bus, int addrlo,
-                       int addrhi, int devadlo, int devadhi,
-                       int reglo, int reghi, unsigned short data)
+static int mdio_write_ranges(struct mii_dev *bus, int addrlo,
+                            int addrhi, int devadlo, int devadhi,
+                            int reglo, int reghi, unsigned short data)
 {
        int addr, devad, reg;
        int err = 0;
@@ -79,9 +79,9 @@ err_out:
        return err;
 }
 
-int mdio_read_ranges(struct mii_dev *bus, int addrlo,
-                       int addrhi, int devadlo, int devadhi,
-                       int reglo, int reghi)
+static int mdio_read_ranges(struct mii_dev *bus, int addrlo,
+                           int addrhi, int devadlo, int devadhi,
+                           int reglo, int reghi)
 {
        int addr, devad, reg;
 
@@ -91,9 +91,9 @@ int mdio_read_ranges(struct mii_dev *bus, int addrlo,
 
                for (devad = devadlo; devad <= devadhi; devad++) {
                        for (reg = reglo; reg <= reghi; reg++) {
-                               u16 val;
-                               val = bus->read(bus, addr, devad, reg);
+                               int val;
 
+                               val = bus->read(bus, addr, devad, reg);
                                if (val < 0) {
                                        printf("Error\n");
 
@@ -112,8 +112,8 @@ int mdio_read_ranges(struct mii_dev *bus, int addrlo,
 }
 
 /* The register will be in the form [a[-b].]x[-y] */
-int extract_reg_range(char *input, int *devadlo, int *devadhi,
-               int *reglo, int *reghi)
+static int extract_reg_range(char *input, int *devadlo, int *devadhi,
+                            int *reglo, int *reghi)
 {
        char *regstr;
 
@@ -141,8 +141,8 @@ int extract_reg_range(char *input, int *devadlo, int *devadhi,
        return extract_range(regstr, reglo, reghi);
 }
 
-int extract_phy_range(char *const argv[], int argc, struct mii_dev **bus,
-               int *addrlo, int *addrhi)
+static int extract_phy_range(char *const argv[], int argc, struct mii_dev **bus,
+                            int *addrlo, int *addrhi)
 {
        struct phy_device *phydev;
 
@@ -193,7 +193,7 @@ static int do_mdio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        struct mii_dev *bus;
 
        if (argc < 2)
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        /*
         * We use the last specified parameters, unless new ones are