summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2015-12-07 04:38:58 +0100
committerDavid S. Miller <davem@davemloft.net>2015-12-07 05:05:56 +0100
commit7bf9ae016efc0cf08263fbee5ac708c23b90792e (patch)
tree5449361d3073b9b2598584ac594694ad60f88838 /drivers/net
parentnet: cdc_ncm: add "ndp_to_end" sysfs attribute (diff)
downloadlinux-7bf9ae016efc0cf08263fbee5ac708c23b90792e.tar.xz
linux-7bf9ae016efc0cf08263fbee5ac708c23b90792e.zip
PHY: DP83867: Remove looking in parent device for OF properties
Device tree properties for a phy device are expected to be in the phy node. The current code for the DP83867 also tries to look in the parent node. The devices binding documentation does not mention this, no current device tree file makes use of this, and it is not behaviour we want. So remove looking in the parent device. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Acked-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/phy/dp83867.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
index 32f10662f4ac..4ebf601073d9 100644
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@ -107,10 +107,7 @@ static int dp83867_of_init(struct phy_device *phydev)
struct device_node *of_node = dev->of_node;
int ret;
- if (!of_node && dev->parent->of_node)
- of_node = dev->parent->of_node;
-
- if (!phydev->dev.of_node)
+ if (!of_node)
return -ENODEV;
ret = of_property_read_u32(of_node, "ti,rx-internal-delay",