Skip to content

Commit

Permalink
net: dsa: update dsa_of_{probe, remove} to use a device pointer
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Florian Fainelli authored and David S. Miller committed Mar 6, 2015
1 parent 4961272 commit f1a26a0
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions net/dsa/dsa.c
Original file line number Diff line number Diff line change
Expand Up @@ -563,9 +563,9 @@ static void dsa_of_free_platform_data(struct dsa_platform_data *pd)
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 mii_bus *mdio_bus;
struct platform_device *ethernet_dev;
Expand Down Expand Up @@ -597,7 +597,7 @@ static int dsa_of_probe(struct platform_device *pdev)
if (!pd)
return -ENOMEM;

pdev->dev.platform_data = pd;
dev->platform_data = pd;
pd->netdev = &ethernet_dev->dev;
pd->nr_chips = of_get_available_child_count(np);
if (pd->nr_chips > DSA_MAX_SWITCHES)
Expand Down Expand Up @@ -670,27 +670,27 @@ static int dsa_of_probe(struct platform_device *pdev)
dsa_of_free_platform_data(pd);
out_free:
kfree(pd);
pdev->dev.platform_data = NULL;
dev->platform_data = NULL;
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;

dsa_of_free_platform_data(pd);
kfree(pd);
}
#else
static inline int dsa_of_probe(struct platform_device *pdev)
static inline int dsa_of_probe(struct device *dev)
{
return 0;
}

static inline void dsa_of_remove(struct platform_device *pdev)
static inline void dsa_of_remove(struct device *dev)
{
}
#endif
Expand All @@ -706,7 +706,7 @@ static int dsa_probe(struct platform_device *pdev)
dsa_driver_version);

if (pdev->dev.of_node) {
ret = dsa_of_probe(pdev);
ret = dsa_of_probe(&pdev->dev);
if (ret)
return ret;

Expand Down Expand Up @@ -777,7 +777,7 @@ static int dsa_probe(struct platform_device *pdev)
return 0;

out:
dsa_of_remove(pdev);
dsa_of_remove(&pdev->dev);

return ret;
}
Expand All @@ -799,7 +799,7 @@ static int dsa_remove(struct platform_device *pdev)
dsa_switch_destroy(ds);
}

dsa_of_remove(pdev);
dsa_of_remove(&pdev->dev);

return 0;
}
Expand Down

0 comments on commit f1a26a0

Please sign in to comment.