Browse Source

net: dsa: Rename and export dev_to_net_device()

In preparation for using this function in net/dsa/dsa2.c, rename the function
to make its scope DSA specific, and export it.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Florian Fainelli 8 years ago
parent
commit
14b89f36ee
2 changed files with 4 additions and 2 deletions
  1. 1 0
      include/net/dsa.h
  2. 3 2
      net/dsa/dsa.c

+ 1 - 0
include/net/dsa.h

@@ -445,6 +445,7 @@ struct dsa_switch_driver {
 void register_switch_driver(struct dsa_switch_driver *type);
 void register_switch_driver(struct dsa_switch_driver *type);
 void unregister_switch_driver(struct dsa_switch_driver *type);
 void unregister_switch_driver(struct dsa_switch_driver *type);
 struct mii_bus *dsa_host_dev_to_mii_bus(struct device *dev);
 struct mii_bus *dsa_host_dev_to_mii_bus(struct device *dev);
+struct net_device *dsa_dev_to_net_device(struct device *dev);
 
 
 static inline bool dsa_uses_tagged_protocol(struct dsa_switch_tree *dst)
 static inline bool dsa_uses_tagged_protocol(struct dsa_switch_tree *dst)
 {
 {

+ 3 - 2
net/dsa/dsa.c

@@ -492,7 +492,7 @@ struct mii_bus *dsa_host_dev_to_mii_bus(struct device *dev)
 }
 }
 EXPORT_SYMBOL_GPL(dsa_host_dev_to_mii_bus);
 EXPORT_SYMBOL_GPL(dsa_host_dev_to_mii_bus);
 
 
-static struct net_device *dev_to_net_device(struct device *dev)
+struct net_device *dsa_dev_to_net_device(struct device *dev)
 {
 {
 	struct device *d;
 	struct device *d;
 
 
@@ -509,6 +509,7 @@ static struct net_device *dev_to_net_device(struct device *dev)
 
 
 	return NULL;
 	return NULL;
 }
 }
+EXPORT_SYMBOL_GPL(dsa_dev_to_net_device);
 
 
 #ifdef CONFIG_OF
 #ifdef CONFIG_OF
 static int dsa_of_setup_routing_table(struct dsa_platform_data *pd,
 static int dsa_of_setup_routing_table(struct dsa_platform_data *pd,
@@ -817,7 +818,7 @@ static int dsa_probe(struct platform_device *pdev)
 		dev = pd->of_netdev;
 		dev = pd->of_netdev;
 		dev_hold(dev);
 		dev_hold(dev);
 	} else {
 	} else {
-		dev = dev_to_net_device(pd->netdev);
+		dev = dsa_dev_to_net_device(pd->netdev);
 	}
 	}
 	if (dev == NULL) {
 	if (dev == NULL) {
 		ret = -EPROBE_DEFER;
 		ret = -EPROBE_DEFER;