p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net: dsa: Centralize setting up ports 

Now that setting up a port is identical for all switches, centralisers
the code looping over all the ports to set them up.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andrew Lunn 2015-05-06 01:09:48 +02:00 committed by David S. Miller
parent 54d792f257
commit dbde9e6667
6 changed files with 20 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/dsa/mv88e6123_61_65.c
View File

@ -83,7 +83,6 @@ static int mv88e6123_61_65_setup_global(struct dsa_switch *ds)
static int mv88e6123_61_65_setup(struct dsa_switch *ds) static int mv88e6123_61_65_setup(struct dsa_switch *ds)
{ {
struct mv88e6xxx_priv_state *ps = ds_to_priv(ds); struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
int i;
int ret; int ret;
ret = mv88e6xxx_setup_common(ds); ret = mv88e6xxx_setup_common(ds);
@ -110,13 +109,7 @@ static int mv88e6123_61_65_setup(struct dsa_switch *ds)
if (ret < 0) if (ret < 0)
return ret; return ret;
for (i = 0; i < ps->num_ports; i++) { return mv88e6xxx_setup_ports(ds);
ret = mv88e6xxx_setup_port(ds, i);
if (ret < 0)
return ret;
}
return 0;
} }
struct dsa_switch_driver mv88e6123_61_65_switch_driver = { struct dsa_switch_driver mv88e6123_61_65_switch_driver = {

9
drivers/net/dsa/mv88e6131.c
View File

@ -86,7 +86,6 @@ static int mv88e6131_setup_global(struct dsa_switch *ds)
static int mv88e6131_setup(struct dsa_switch *ds) static int mv88e6131_setup(struct dsa_switch *ds)
{ {
struct mv88e6xxx_priv_state *ps = ds_to_priv(ds); struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
int i;
int ret; int ret;
ret = mv88e6xxx_setup_common(ds); ret = mv88e6xxx_setup_common(ds);
@ -118,13 +117,7 @@ static int mv88e6131_setup(struct dsa_switch *ds)
if (ret < 0) if (ret < 0)
return ret; return ret;
for (i = 0; i < ps->num_ports; i++) { return mv88e6xxx_setup_ports(ds);
ret = mv88e6xxx_setup_port(ds, i);
if (ret < 0)
return ret;
}
return 0;
} }
static int mv88e6131_port_to_phy_addr(struct dsa_switch *ds, int port) static int mv88e6131_port_to_phy_addr(struct dsa_switch *ds, int port)

12
drivers/net/dsa/mv88e6171.c
View File

@ -69,7 +69,6 @@ static int mv88e6171_setup_global(struct dsa_switch *ds)
static int mv88e6171_setup(struct dsa_switch *ds) static int mv88e6171_setup(struct dsa_switch *ds)
{ {
struct mv88e6xxx_priv_state *ps = ds_to_priv(ds); struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
int i;
int ret; int ret;
ret = mv88e6xxx_setup_common(ds); ret = mv88e6xxx_setup_common(ds);
@ -86,16 +85,7 @@ static int mv88e6171_setup(struct dsa_switch *ds)
if (ret < 0) if (ret < 0)
return ret; return ret;
for (i = 0; i < ps->num_ports; i++) { return mv88e6xxx_setup_ports(ds);
if (!(dsa_is_cpu_port(ds, i) || ds->phys_port_mask & (1 << i)))
continue;
ret = mv88e6xxx_setup_port(ds, i);
if (ret < 0)
return ret;
}
return 0;
} }
static int mv88e6171_get_eee(struct dsa_switch *ds, int port, static int mv88e6171_get_eee(struct dsa_switch *ds, int port,

9
drivers/net/dsa/mv88e6352.c
View File

@ -136,7 +136,6 @@ static int mv88e6352_setup(struct dsa_switch *ds)
{ {
struct mv88e6xxx_priv_state *ps = ds_to_priv(ds); struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
int ret; int ret;
int i;
ret = mv88e6xxx_setup_common(ds); ret = mv88e6xxx_setup_common(ds);
if (ret < 0) if (ret < 0)
@ -154,13 +153,7 @@ static int mv88e6352_setup(struct dsa_switch *ds)
if (ret < 0) if (ret < 0)
return ret; return ret;
for (i = 0; i < ps->num_ports; i++) { return mv88e6xxx_setup_ports(ds);
ret = mv88e6xxx_setup_port(ds, i);
if (ret < 0)
return ret;
}
return 0;
} }
static int mv88e6352_read_eeprom_word(struct dsa_switch *ds, int addr) static int mv88e6352_read_eeprom_word(struct dsa_switch *ds, int addr)

16
drivers/net/dsa/mv88e6xxx.c
View File

@ -1309,7 +1309,7 @@ static void mv88e6xxx_bridge_work(struct work_struct *work)
} }
} }
int mv88e6xxx_setup_port(struct dsa_switch *ds, int port) static int mv88e6xxx_setup_port(struct dsa_switch *ds, int port)
{ {
struct mv88e6xxx_priv_state *ps = ds_to_priv(ds); struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
int ret, fid; int ret, fid;
@ -1548,6 +1548,20 @@ int mv88e6xxx_setup_port(struct dsa_switch *ds, int port)
return ret; return ret;
} }
int mv88e6xxx_setup_ports(struct dsa_switch *ds)
{
struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
int ret;
int i;
for (i = 0; i < ps->num_ports; i++) {
ret = mv88e6xxx_setup_port(ds, i);
if (ret < 0)
return ret;
}
return 0;
}
int mv88e6xxx_setup_common(struct dsa_switch *ds) int mv88e6xxx_setup_common(struct dsa_switch *ds)
{ {
struct mv88e6xxx_priv_state *ps = ds_to_priv(ds); struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

2
drivers/net/dsa/mv88e6xxx.h
View File

@ -336,7 +336,7 @@ struct mv88e6xxx_hw_stat {
}; };
int mv88e6xxx_switch_reset(struct dsa_switch *ds, bool ppu_active); int mv88e6xxx_switch_reset(struct dsa_switch *ds, bool ppu_active);
int mv88e6xxx_setup_port(struct dsa_switch *ds, int port); int mv88e6xxx_setup_ports(struct dsa_switch *ds);
int mv88e6xxx_setup_common(struct dsa_switch *ds); int mv88e6xxx_setup_common(struct dsa_switch *ds);
int mv88e6xxx_setup_global(struct dsa_switch *ds); int mv88e6xxx_setup_global(struct dsa_switch *ds);
int __mv88e6xxx_reg_read(struct mii_bus *bus, int sw_addr, int addr, int reg); int __mv88e6xxx_reg_read(struct mii_bus *bus, int sw_addr, int addr, int reg);