Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acdaffcc authored Mar 26, 2015 by Guenter Roeck Committed by David S. Miller Mar 29, 2015

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>

parent 5ce58c2f

drivers/net/dsa/mv88e6123_61_65.c

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -293,13 +293,12 @@ static int mv88e6123_61_65_setup_port(struct dsa_switch *ds, int p)

	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);
	int i;		int i;
	int ret;		int ret;

	mutex_init(&ps->smi_mutex);		ret = mv88e6xxx_setup_common(ds);
	mutex_init(&ps->stats_mutex);		if (ret < 0)
	mutex_init(&ps->phy_mutex);		return ret;

	ret = mv88e6123_61_65_switch_reset(ds);		ret = mv88e6123_61_65_switch_reset(ds);
	if (ret < 0)		if (ret < 0)

drivers/net/dsa/mv88e6171.c

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -292,12 +292,12 @@ static int mv88e6171_setup_port(struct dsa_switch *ds, int p)

	static int mv88e6171_setup(struct dsa_switch *ds)		static int mv88e6171_setup(struct dsa_switch *ds)
	{		{
	struct mv88e6xxx_priv_state ps = (void )(ds + 1);
	int i;		int i;
	int ret;		int ret;

	mutex_init(&ps->smi_mutex);		ret = mv88e6xxx_setup_common(ds);
	mutex_init(&ps->stats_mutex);		if (ret < 0)
			return ret;

	ret = mv88e6171_switch_reset(ds);		ret = mv88e6171_switch_reset(ds);
	if (ret < 0)		if (ret < 0)
	@@ -318,8 +318,6 @@ static int mv88e6171_setup(struct dsa_switch *ds)
	return ret;		return ret;
	}		}

	mutex_init(&ps->phy_mutex);

	return 0;		return 0;
	}		}

drivers/net/dsa/mv88e6352.c

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -385,9 +385,10 @@ static int mv88e6352_setup(struct dsa_switch *ds)
	int ret;		int ret;
	int i;		int i;

	mutex_init(&ps->smi_mutex);		ret = mv88e6xxx_setup_common(ds);
	mutex_init(&ps->stats_mutex);		if (ret < 0)
	mutex_init(&ps->phy_mutex);		return ret;

	mutex_init(&ps->eeprom_mutex);		mutex_init(&ps->eeprom_mutex);

	ps->id = REG_READ(REG_PORT(0), 0x03) & 0xfff0;		ps->id = REG_READ(REG_PORT(0), 0x03) & 0xfff0;

drivers/net/dsa/mv88e6xxx.c

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -700,6 +700,17 @@ int mv88e6xxx_set_eee(struct dsa_switch *ds, int port,
	return 0;		return 0;
	}		}

			int mv88e6xxx_setup_common(struct dsa_switch *ds)
			{
			struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

			mutex_init(&ps->smi_mutex);
			mutex_init(&ps->stats_mutex);
			mutex_init(&ps->phy_mutex);

			return 0;
			}

	static int __init mv88e6xxx_init(void)		static int __init mv88e6xxx_init(void)
	{		{
	#if IS_ENABLED(CONFIG_NET_DSA_MV88E6131)		#if IS_ENABLED(CONFIG_NET_DSA_MV88E6131)

drivers/net/dsa/mv88e6xxx.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -57,6 +57,7 @@ struct mv88e6xxx_hw_stat {
	int reg;		int reg;
	};		};

			int mv88e6xxx_setup_common(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);
	int mv88e6xxx_reg_read(struct dsa_switch *ds, int addr, int reg);		int mv88e6xxx_reg_read(struct dsa_switch *ds, int addr, int reg);
	int __mv88e6xxx_reg_write(struct mii_bus *bus, int sw_addr, int addr,		int __mv88e6xxx_reg_write(struct mii_bus *bus, int sw_addr, int addr,