From bffc89d02acee14c2c86118c2cbaa662f9ac2be1 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Tue, 2 Apr 2013 09:35:10 +0000 Subject: [PATCH] --- yaml --- r: 368821 b: refs/heads/master c: 6c5f7808efd7efc27be0f3c102f2a631ad6f038c h: refs/heads/master i: 368819: 01f8643ff96b350d7fc1fad560300e6995d24fd9 v: v3 --- [refs] | 2 +- .../drivers/net/ethernet/freescale/fec_main.c | 19 +------------------ 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 4af2a6b25b85..9796519a8602 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 509070437d15ed06c3b0aa674661adc2906b83f2 +refs/heads/master: 6c5f7808efd7efc27be0f3c102f2a631ad6f038c diff --git a/trunk/drivers/net/ethernet/freescale/fec_main.c b/trunk/drivers/net/ethernet/freescale/fec_main.c index a82a70345bbf..621d07565dce 100644 --- a/trunk/drivers/net/ethernet/freescale/fec_main.c +++ b/trunk/drivers/net/ethernet/freescale/fec_main.c @@ -913,7 +913,6 @@ static void fec_get_mac(struct net_device *ndev) */ iap = macaddr; -#ifdef CONFIG_OF /* * 2) from device tree data */ @@ -925,7 +924,6 @@ static void fec_get_mac(struct net_device *ndev) iap = (unsigned char *) mac; } } -#endif /* * 3) from flash or fuse (via platform data) @@ -1679,16 +1677,6 @@ static int fec_enet_init(struct net_device *ndev) } #ifdef CONFIG_OF -static int fec_get_phy_mode_dt(struct platform_device *pdev) -{ - struct device_node *np = pdev->dev.of_node; - - if (np) - return of_get_phy_mode(np); - - return -ENODEV; -} - static void fec_reset_phy(struct platform_device *pdev) { int err, phy_reset; @@ -1717,11 +1705,6 @@ static void fec_reset_phy(struct platform_device *pdev) gpio_set_value(phy_reset, 1); } #else /* CONFIG_OF */ -static int fec_get_phy_mode_dt(struct platform_device *pdev) -{ - return -ENODEV; -} - static void fec_reset_phy(struct platform_device *pdev) { /* @@ -1780,7 +1763,7 @@ fec_probe(struct platform_device *pdev) platform_set_drvdata(pdev, ndev); - ret = fec_get_phy_mode_dt(pdev); + ret = of_get_phy_mode(pdev->dev.of_node); if (ret < 0) { pdata = pdev->dev.platform_data; if (pdata)