UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: dsa: remove useless args of dsa_cpu_dsa_setup 

dsa_cpu_dsa_setup currently takes 4 arguments but they are all available
from the dsa_port argument. Remove all others.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vivien Didelot 2017-08-05 16:20:18 -04:00 committed by David S. Miller
parent 206e41fe7f
commit 47d0dcc354
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/dsa/dsa.c
View File

@ -67,17 +67,17 @@ const struct dsa_device_ops *dsa_device_ops[DSA_TAG_LAST] = {
[DSA_TAG_PROTO_NONE] = &none_ops, [DSA_TAG_PROTO_NONE] = &none_ops,
}; };
int dsa_cpu_dsa_setup(struct dsa_switch *ds, struct device *dev, int dsa_cpu_dsa_setup(struct dsa_port *port)
struct dsa_port *dport, int 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; struct phy_device *phydev;
int ret, mode; int ret, mode;
if (of_phy_is_fixed_link(port_dn)) { if (of_phy_is_fixed_link(port_dn)) {
ret = of_phy_register_fixed_link(port_dn); ret = of_phy_register_fixed_link(port_dn);
if (ret) { if (ret) {
dev_err(dev, "failed to register fixed PHY\n"); dev_err(ds->dev, "failed to register fixed PHY\n");
return ret; return ret;
} }
phydev = of_phy_find_device(port_dn); 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_config_init(phydev);
genphy_read_status(phydev); genphy_read_status(phydev);
if (ds->ops->adjust_link) 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); put_device(&phydev->mdio.dev);
} }

4
net/dsa/dsa2.c
View File

@ -219,7 +219,7 @@ static int dsa_dsa_port_apply(struct dsa_port *port)
struct dsa_switch *ds = port->ds; struct dsa_switch *ds = port->ds;
int err; int err;
err = dsa_cpu_dsa_setup(ds, ds->dev, port, port->index); err = dsa_cpu_dsa_setup(port);
if (err) { if (err) {
dev_warn(ds->dev, "Failed to setup dsa port %d: %d\n", dev_warn(ds->dev, "Failed to setup dsa port %d: %d\n",
port->index, err); port->index, err);
@ -243,7 +243,7 @@ static int dsa_cpu_port_apply(struct dsa_port *port)
struct dsa_switch *ds = port->ds; struct dsa_switch *ds = port->ds;
int err; int err;
err = dsa_cpu_dsa_setup(ds, ds->dev, port, port->index); err = dsa_cpu_dsa_setup(port);
if (err) { if (err) {
dev_warn(ds->dev, "Failed to setup cpu port %d: %d\n", dev_warn(ds->dev, "Failed to setup cpu port %d: %d\n",
port->index, err); port->index, err);

3
net/dsa/dsa_priv.h
View File

@ -101,8 +101,7 @@ struct dsa_slave_priv {
}; };
/* dsa.c */ /* dsa.c */
int dsa_cpu_dsa_setup(struct dsa_switch *ds, struct device *dev, int dsa_cpu_dsa_setup(struct dsa_port *port);
struct dsa_port *dport, int port);
void dsa_cpu_dsa_destroy(struct dsa_port *dport); void dsa_cpu_dsa_destroy(struct dsa_port *dport);
const struct dsa_device_ops *dsa_resolve_tag_protocol(int tag_protocol); const struct dsa_device_ops *dsa_resolve_tag_protocol(int tag_protocol);
int dsa_cpu_port_ethtool_setup(struct dsa_port *cpu_dp); int dsa_cpu_port_ethtool_setup(struct dsa_port *cpu_dp);

4
net/dsa/legacy.c
View File

@ -80,15 +80,13 @@ dsa_switch_probe(struct device *parent, struct device *host_dev, int sw_addr,
/* basic switch operations **************************************************/ /* basic switch operations **************************************************/
static int dsa_cpu_dsa_setups(struct dsa_switch *ds) static int dsa_cpu_dsa_setups(struct dsa_switch *ds)
{ {
struct dsa_port *dport;
int ret, port; int ret, port;
for (port = 0; port < ds->num_ports; port++) { for (port = 0; port < ds->num_ports; port++) {
if (!(dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port))) if (!(dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port)))
continue; continue;
dport = &ds->ports[port]; ret = dsa_cpu_dsa_setup(&ds->ports[port]);
ret = dsa_cpu_dsa_setup(ds, ds->dev, dport, port);
if (ret) if (ret)
return ret; return ret;
} }