leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: dsa: utilize of_find_net_device_by_node

Browse Source 
Using of_find_device_by_node() restricts the search to platform_device that
match the specified device_node pointer. This is not even remotely true for
network devices backed by a pci_device for instance.

of_find_net_device_by_node() allows us to do a more thorough lookup to find the
struct net_device corresponding to a particular device_node pointer.

For symetry with the non-OF code path, we hold the net_device pointer in
dsa_probe() just like what dev_to_net_dev() does when we call this
function.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Fainelli
2015-03-09 14:31:21 -07:00
committed by David S. Miller
parent aa836df958
commit 769a020289
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/dsa.h
View File

@@ -72,6 +72,7 @@ struct dsa_platform_data {
* to the root switch chip of the tree. * to the root switch chip of the tree.
*/ */
struct device *netdev; struct device *netdev;
struct net_device *of_netdev;
/* /*
* Info structs describing each of the switch chips * Info structs describing each of the switch chips

14
net/dsa/dsa.c
View File

@@ -20,6 +20,7 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_mdio.h> #include <linux/of_mdio.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/of_net.h>
#include <linux/sysfs.h> #include <linux/sysfs.h>
#include "dsa_priv.h" #include "dsa_priv.h"
@@ -583,7 +584,7 @@ static int dsa_of_probe(struct device *dev)
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
struct device_node *child, *mdio, *ethernet, *port, *link; struct device_node *child, *mdio, *ethernet, *port, *link;
struct mii_bus *mdio_bus; struct mii_bus *mdio_bus;
struct platform_device *ethernet_dev; struct net_device *ethernet_dev;
struct dsa_platform_data *pd; struct dsa_platform_data *pd;
struct dsa_chip_data *cd; struct dsa_chip_data *cd;
const char *port_name; const char *port_name;
@@ -604,7 +605,7 @@ static int dsa_of_probe(struct device *dev)
if (!ethernet) if (!ethernet)
return -EINVAL; return -EINVAL;
ethernet_dev = of_find_device_by_node(ethernet); ethernet_dev = of_find_net_device_by_node(ethernet);
if (!ethernet_dev) if (!ethernet_dev)
return -EPROBE_DEFER; return -EPROBE_DEFER;
@@ -613,7 +614,7 @@ static int dsa_of_probe(struct device *dev)
return -ENOMEM; return -ENOMEM;
dev->platform_data = pd; dev->platform_data = pd;
pd->netdev = &ethernet_dev->dev; pd->of_netdev = ethernet_dev;
pd->nr_chips = of_get_available_child_count(np); pd->nr_chips = of_get_available_child_count(np);
if (pd->nr_chips > DSA_MAX_SWITCHES) if (pd->nr_chips > DSA_MAX_SWITCHES)
pd->nr_chips = DSA_MAX_SWITCHES; pd->nr_chips = DSA_MAX_SWITCHES;
@@ -771,10 +772,15 @@ static int dsa_probe(struct platform_device *pdev)
pd = pdev->dev.platform_data; pd = pdev->dev.platform_data;
} }
if (pd == NULL || pd->netdev == NULL) if (pd == NULL || (pd->netdev == NULL && pd->of_netdev == NULL))
return -EINVAL; return -EINVAL;
if (pd->of_netdev) {
dev = pd->of_netdev;
dev_hold(dev);
} else {
dev = dev_to_net_device(pd->netdev); dev = dev_to_net_device(pd->netdev);
}
if (dev == NULL) { if (dev == NULL) {
ret = -EPROBE_DEFER; ret = -EPROBE_DEFER;
goto out; goto out;