diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2015-03-26 18:36:28 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-29 13:23:49 -0700 |
| commit | acdaffcc890a29262c9bb47e287b62488c85eb59 (patch) | |
| tree | 53f6701ef582afec91dbf5f8e82f1463a33ce2f9 /drivers/net/dsa/mv88e6171.c | |
| parent | 5ce58c2f13eaa8ca6d7e1041175433bd8cc55756 (diff) | |
| download | blackbird-obmc-linux-acdaffcc890a29262c9bb47e287b62488c85eb59.tar.gz blackbird-obmc-linux-acdaffcc890a29262c9bb47e287b62488c85eb59.zip | |
net: dsa: mv88e6xxx: Factor out common initialization code
Code used and needed in mv886xxx.c should be initialized there as well,
so factor it out from the individual initialization files.
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/mv88e6171.c')
| -rw-r--r-- | drivers/net/dsa/mv88e6171.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/dsa/mv88e6171.c b/drivers/net/dsa/mv88e6171.c index 9808c860a797..2f6662c246fa 100644 --- a/drivers/net/dsa/mv88e6171.c +++ b/drivers/net/dsa/mv88e6171.c @@ -292,12 +292,12 @@ static int mv88e6171_setup_port(struct dsa_switch *ds, int p) static int mv88e6171_setup(struct dsa_switch *ds) { - struct mv88e6xxx_priv_state *ps = (void *)(ds + 1); int i; int ret; - mutex_init(&ps->smi_mutex); - mutex_init(&ps->stats_mutex); + ret = mv88e6xxx_setup_common(ds); + if (ret < 0) + return ret; ret = mv88e6171_switch_reset(ds); if (ret < 0) @@ -318,8 +318,6 @@ static int mv88e6171_setup(struct dsa_switch *ds) return ret; } - mutex_init(&ps->phy_mutex); - return 0; } |
