summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Hofstee <jeroen@myspectrum.nl>2014-10-08 22:57:26 +0200
committerTom Rini <trini@ti.com>2014-10-25 07:01:59 -0400
commit3c6928fd7b0f849cd1ed882f41a769286e3e35d1 (patch)
tree31e49b7d6f0fbf8a3c95313589f9c9eb268c9f66
parent002ad7b87780d80c4636f623d4e9e4cc89734de4 (diff)
downloadu-boot-imx-3c6928fd7b0f849cd1ed882f41a769286e3e35d1.zip
u-boot-imx-3c6928fd7b0f849cd1ed882f41a769286e3e35d1.tar.gz
u-boot-imx-3c6928fd7b0f849cd1ed882f41a769286e3e35d1.tar.bz2
net: phy: fix warnings with W=1
get_phy_id is marked weak but has no protype nor a strong version, just make it static. Use __weak for board_phy_config. Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
-rw-r--r--drivers/net/phy/phy.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 1d6c14f..f1ace3c 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -575,7 +575,7 @@ static struct phy_device *phy_device_create(struct mii_dev *bus, int addr,
* Description: Reads the ID registers of the PHY at @addr on the
* @bus, stores it in @phy_id and returns zero on success.
*/
-int __weak get_phy_id(struct mii_dev *bus, int addr, int devad, u32 *phy_id)
+static int get_phy_id(struct mii_dev *bus, int addr, int devad, u32 *phy_id)
{
int phy_reg;
@@ -785,16 +785,13 @@ int phy_startup(struct phy_device *phydev)
return 0;
}
-static int __board_phy_config(struct phy_device *phydev)
+__weak int board_phy_config(struct phy_device *phydev)
{
if (phydev->drv->config)
return phydev->drv->config(phydev);
return 0;
}
-int board_phy_config(struct phy_device *phydev)
- __attribute__((weak, alias("__board_phy_config")));
-
int phy_config(struct phy_device *phydev)
{
/* Invoke an optional board-specific helper */