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

net: dsa: Pass device pointer to dsa_register_switch

Browse Source 
In preparation for allowing dsa_register_switch() to be supplied with
device/platform data, pass down a struct device pointer instead of a
struct device_node.

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 2017-01-26 10:45:51 -08:00 committed by David S. Miller
parent 80c8eae6ee
commit 55ed0ce089
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/dsa/b53/b53_common.c
View File

@ -1894,7 +1894,7 @@ int b53_switch_register(struct b53_device *dev)
pr_info("found switch: %s, rev %i\n", dev->name, dev->core_rev); pr_info("found switch: %s, rev %i\n", dev->name, dev->core_rev);
return dsa_register_switch(dev->ds, dev->ds->dev->of_node); return dsa_register_switch(dev->ds, dev->ds->dev);
} }
EXPORT_SYMBOL(b53_switch_register); EXPORT_SYMBOL(b53_switch_register);

7
drivers/net/dsa/mv88e6xxx/chip.c
View File

@ -4356,8 +4356,7 @@ static struct dsa_switch_driver mv88e6xxx_switch_drv = {
.ops = &mv88e6xxx_switch_ops, .ops = &mv88e6xxx_switch_ops,
}; };
static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip, static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip)
struct device_node *np)
{ {
struct device *dev = chip->dev; struct device *dev = chip->dev;
struct dsa_switch *ds; struct dsa_switch *ds;
@ -4372,7 +4371,7 @@ static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip,
dev_set_drvdata(dev, ds); dev_set_drvdata(dev, ds);
return dsa_register_switch(ds, np); return dsa_register_switch(ds, dev);
} }
static void mv88e6xxx_unregister_switch(struct mv88e6xxx_chip *chip) static void mv88e6xxx_unregister_switch(struct mv88e6xxx_chip *chip)
@ -4456,7 +4455,7 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev)
if (err) if (err)
goto out_g2_irq; goto out_g2_irq;
err = mv88e6xxx_register_switch(chip, np); err = mv88e6xxx_register_switch(chip);
if (err) if (err)
goto out_mdio; goto out_mdio;

2
drivers/net/dsa/qca8k.c
View File

@ -964,7 +964,7 @@ qca8k_sw_probe(struct mdio_device *mdiodev)
mutex_init(&priv->reg_mutex); mutex_init(&priv->reg_mutex);
dev_set_drvdata(&mdiodev->dev, priv); dev_set_drvdata(&mdiodev->dev, priv);
return dsa_register_switch(priv->ds, priv->ds->dev->of_node); return dsa_register_switch(priv->ds, &mdiodev->dev);
} }
static void static void

2
include/net/dsa.h
View File

@ -387,7 +387,7 @@ static inline bool dsa_uses_tagged_protocol(struct dsa_switch_tree *dst)
} }
void dsa_unregister_switch(struct dsa_switch *ds); void dsa_unregister_switch(struct dsa_switch *ds);
int dsa_register_switch(struct dsa_switch *ds, struct device_node *np); int dsa_register_switch(struct dsa_switch *ds, struct device *dev);
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
int dsa_switch_suspend(struct dsa_switch *ds); int dsa_switch_suspend(struct dsa_switch *ds);
int dsa_switch_resume(struct dsa_switch *ds); int dsa_switch_resume(struct dsa_switch *ds);

7
net/dsa/dsa2.c
View File

@ -578,8 +578,9 @@ static struct device_node *dsa_get_ports(struct dsa_switch *ds,
return ports; return ports;
} }
static int _dsa_register_switch(struct dsa_switch *ds, struct device_node *np) static int _dsa_register_switch(struct dsa_switch *ds, struct device *dev)
{ {
struct device_node *np = dev->of_node;
struct device_node *ports = dsa_get_ports(ds, np); struct device_node *ports = dsa_get_ports(ds, np);
struct dsa_switch_tree *dst; struct dsa_switch_tree *dst;
u32 tree, index; u32 tree, index;
@ -659,12 +660,12 @@ out:
return err; return err;
} }
int dsa_register_switch(struct dsa_switch *ds, struct device_node *np) int dsa_register_switch(struct dsa_switch *ds, struct device *dev)
{ {
int err; int err;
mutex_lock(&dsa2_mutex); mutex_lock(&dsa2_mutex);
err = _dsa_register_switch(ds, np); err = _dsa_register_switch(ds, dev);
mutex_unlock(&dsa2_mutex); mutex_unlock(&dsa2_mutex);
return err; return err;