diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-07 14:24:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-07 14:24:21 -0700 |
| commit | d899cb2e5fe15d3cddc5ae2af9cd579c3280bb4b (patch) | |
| tree | 7ab24187543b7466dac94f70661dcda50753d74f /net/dsa/dsa.c | |
| parent | net: hns3: fix spelling mistake: "capabilty" -> "capability" (diff) | |
| parent | net: dsa: remove useless args of dsa_slave_create (diff) | |
| download | linux-d899cb2e5fe15d3cddc5ae2af9cd579c3280bb4b.tar.gz linux-d899cb2e5fe15d3cddc5ae2af9cd579c3280bb4b.zip | |
Merge branch 'net-dsa-remove-useless-arguments'
Vivien Didelot says:
====================
net: dsa: remove useless arguments
Several DSA core setup functions take many arguments, mostly because of
the legacy code. This patch series removes the useless args of these
functions, where either the dsa_switch or dsa_port argument is enough.
Changes in v2:
- ds->dev is already assigned by dsa_switch_alloc
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/dsa.c')
| -rw-r--r-- | net/dsa/dsa.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index a91e520e735f..4118848b8e58 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -67,17 +67,17 @@ const struct dsa_device_ops *dsa_device_ops[DSA_TAG_LAST] = { [DSA_TAG_PROTO_NONE] = &none_ops, }; -int dsa_cpu_dsa_setup(struct dsa_switch *ds, struct device *dev, - struct dsa_port *dport, int port) +int dsa_cpu_dsa_setup(struct dsa_port *port) { - struct device_node *port_dn = dport->dn; + struct device_node *port_dn = port->dn; + struct dsa_switch *ds = port->ds; struct phy_device *phydev; int ret, mode; if (of_phy_is_fixed_link(port_dn)) { ret = of_phy_register_fixed_link(port_dn); if (ret) { - dev_err(dev, "failed to register fixed PHY\n"); + dev_err(ds->dev, "failed to register fixed PHY\n"); return ret; } phydev = of_phy_find_device(port_dn); @@ -90,7 +90,7 @@ int dsa_cpu_dsa_setup(struct dsa_switch *ds, struct device *dev, genphy_config_init(phydev); genphy_read_status(phydev); if (ds->ops->adjust_link) - ds->ops->adjust_link(ds, port, phydev); + ds->ops->adjust_link(ds, port->index, phydev); put_device(&phydev->mdio.dev); } |