summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBen Warren <biggerbadderben@gmail.com>2008-08-07 23:26:35 -0700
committerBen Warren <biggerbadderben@gmail.com>2008-08-07 23:26:35 -0700
commitd9d78ee46d9a396d0a81d00c2b003a9bd32c2e61 (patch)
tree0d6c743a7dd82ac01880bd0db4cf9638a1b5bdfc /drivers
parentd5d28fe4aad5f4535400647a5617c11039506467 (diff)
downloadu-boot-imx-d9d78ee46d9a396d0a81d00c2b003a9bd32c2e61.zip
u-boot-imx-d9d78ee46d9a396d0a81d00c2b003a9bd32c2e61.tar.gz
u-boot-imx-d9d78ee46d9a396d0a81d00c2b003a9bd32c2e61.tar.bz2
QE UEC: Fix compiler warnings
Moved static functions earlier in file so forward declarations are not needed. Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/qe/uec.c69
1 files changed, 33 insertions, 36 deletions
diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c
index 049a74d..ba89247 100644
--- a/drivers/qe/uec.c
+++ b/drivers/qe/uec.c
@@ -130,10 +130,6 @@ static uec_info_t eth4_uec_info = {
static struct eth_device *devlist[MAXCONTROLLERS];
-static int uec_miiphy_read(char *devname, unsigned char addr,
- unsigned char reg, unsigned short *value);
-static int uec_miiphy_write(char *devname, unsigned char addr,
- unsigned char reg, unsigned short value);
u16 phy_read (struct uec_mii_info *mii_info, u16 regnum);
void phy_write (struct uec_mii_info *mii_info, u16 regnum, u16 val);
@@ -641,6 +637,39 @@ static void phy_change(struct eth_device *dev)
adjust_link(dev);
}
+#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) \
+ && !defined(BITBANGMII)
+
+/*
+ * Read a MII PHY register.
+ *
+ * Returns:
+ * 0 on success
+ */
+static int uec_miiphy_read(char *devname, unsigned char addr,
+ unsigned char reg, unsigned short *value)
+{
+ *value = uec_read_phy_reg(devlist[0], addr, reg);
+
+ return 0;
+}
+
+/*
+ * Write a MII PHY register.
+ *
+ * Returns:
+ * 0 on success
+ */
+static int uec_miiphy_write(char *devname, unsigned char addr,
+ unsigned char reg, unsigned short value)
+{
+ uec_write_phy_reg(devlist[0], addr, reg, value);
+
+ return 0;
+}
+
+#endif
+
static int uec_set_mac_address(uec_private_t *uec, u8 *mac_addr)
{
uec_t *uec_regs;
@@ -1378,37 +1407,5 @@ int uec_initialize(int index)
return 1;
}
-#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) \
- && !defined(BITBANGMII)
-
-/*
- * Read a MII PHY register.
- *
- * Returns:
- * 0 on success
- */
-static int uec_miiphy_read(char *devname, unsigned char addr,
- unsigned char reg, unsigned short *value)
-{
- *value = uec_read_phy_reg(devlist[0], addr, reg);
-
- return 0;
-}
-
-/*
- * Write a MII PHY register.
- *
- * Returns:
- * 0 on success
- */
-static int uec_miiphy_write(char *devname, unsigned char addr,
- unsigned char reg, unsigned short value)
-{
- uec_write_phy_reg(devlist[0], addr, reg, value);
-
- return 0;
-}
-
-#endif
#endif /* CONFIG_QE */