From 84b3196e9cbcc407daafad99207576e815f1fc8a Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Fri, 23 Sep 2011 02:12:46 +0000 Subject: [PATCH] --- yaml --- r: 266165 b: refs/heads/master c: a9b2c8ef1585e1f14cec03777b1238e0d5ec4ea1 h: refs/heads/master i: 266163: b9b6bd117d21eec8f30c43c7ac31762fc5d27be2 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/freescale/fec.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 3d4ce6a0e44e..9e5aa31efe41 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f04ea74e8aa5b95610bcd2fcb110ffa2ec665dcc +refs/heads/master: a9b2c8ef1585e1f14cec03777b1238e0d5ec4ea1 diff --git a/trunk/drivers/net/ethernet/freescale/fec.c b/trunk/drivers/net/ethernet/freescale/fec.c index 158b82ea6df5..9c1d0594895c 100644 --- a/trunk/drivers/net/ethernet/freescale/fec.c +++ b/trunk/drivers/net/ethernet/freescale/fec.c @@ -1411,24 +1411,22 @@ static int __devinit fec_get_phy_mode_dt(struct platform_device *pdev) return -ENODEV; } -static int __devinit fec_reset_phy(struct platform_device *pdev) +static void __devinit fec_reset_phy(struct platform_device *pdev) { int err, phy_reset; struct device_node *np = pdev->dev.of_node; if (!np) - return -ENODEV; + return; phy_reset = of_get_named_gpio(np, "phy-reset-gpios", 0); err = gpio_request_one(phy_reset, GPIOF_OUT_INIT_LOW, "phy-reset"); if (err) { - pr_warn("FEC: failed to get gpio phy-reset: %d\n", err); - return err; + pr_debug("FEC: failed to get gpio phy-reset: %d\n", err); + return; } msleep(1); gpio_set_value(phy_reset, 1); - - return 0; } #else /* CONFIG_OF */ static inline int fec_get_phy_mode_dt(struct platform_device *pdev) @@ -1436,13 +1434,12 @@ static inline int fec_get_phy_mode_dt(struct platform_device *pdev) return -ENODEV; } -static inline int fec_reset_phy(struct platform_device *pdev) +static inline void fec_reset_phy(struct platform_device *pdev) { /* * In case of platform probe, the reset has been done * by machine code. */ - return 0; } #endif /* CONFIG_OF */