OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: dsa: update dsa_of_{probe, remove} to use a device pointer 

In preparation for allowing a different mechanism to register DSA switch
devices and driver, update dsa_of_probe and dsa_of_remove to take a
struct device pointer since neither of these two functions uses the
struct platform_device pointer.

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-05 12:35:04 -08:00 committed by David S. Miller
parent 496127290f
commit f1a26a062f
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
net/dsa/dsa.c
View File

@ -563,9 +563,9 @@ static void dsa_of_free_platform_data(struct dsa_platform_data *pd)
kfree(pd->chip); kfree(pd->chip);
} }
static int dsa_of_probe(struct platform_device *pdev) static int dsa_of_probe(struct device *dev)
{ {
struct device_node *np = pdev->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 platform_device *ethernet_dev;
@ -597,7 +597,7 @@ static int dsa_of_probe(struct platform_device *pdev)
if (!pd) if (!pd)
return -ENOMEM; return -ENOMEM;
pdev->dev.platform_data = pd; dev->platform_data = pd;
pd->netdev = &ethernet_dev->dev; pd->netdev = &ethernet_dev->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)
@ -670,27 +670,27 @@ out_free_chip:
dsa_of_free_platform_data(pd); dsa_of_free_platform_data(pd);
out_free: out_free:
kfree(pd); kfree(pd);
pdev->dev.platform_data = NULL; dev->platform_data = NULL;
return ret; return ret;
} }
static void dsa_of_remove(struct platform_device *pdev) static void dsa_of_remove(struct device *dev)
{ {
struct dsa_platform_data *pd = pdev->dev.platform_data; struct dsa_platform_data *pd = dev->platform_data;
if (!pdev->dev.of_node) if (!dev->of_node)
return; return;
dsa_of_free_platform_data(pd); dsa_of_free_platform_data(pd);
kfree(pd); kfree(pd);
} }
#else #else
static inline int dsa_of_probe(struct platform_device *pdev) static inline int dsa_of_probe(struct device *dev)
{ {
return 0; return 0;
} }
static inline void dsa_of_remove(struct platform_device *pdev) static inline void dsa_of_remove(struct device *dev)
{ {
} }
#endif #endif
@ -706,7 +706,7 @@ static int dsa_probe(struct platform_device *pdev)
dsa_driver_version); dsa_driver_version);
if (pdev->dev.of_node) { if (pdev->dev.of_node) {
ret = dsa_of_probe(pdev); ret = dsa_of_probe(&pdev->dev);
if (ret) if (ret)
return ret; return ret;
@ -777,7 +777,7 @@ static int dsa_probe(struct platform_device *pdev)
return 0; return 0;
out: out:
dsa_of_remove(pdev); dsa_of_remove(&pdev->dev);
return ret; return ret;
} }
@ -799,7 +799,7 @@ static int dsa_remove(struct platform_device *pdev)
dsa_switch_destroy(ds); dsa_switch_destroy(ds);
} }
dsa_of_remove(pdev); dsa_of_remove(&pdev->dev);
return 0; return 0;
} }