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

Commit 2d79af6e authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: rename _mv88e6xxx_wait 



Now that there is no locked version of the wait routine anymore, rename
the _ prefixed version and make it use the new read API.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 45d33930

drivers/net/dsa/mv88e6xxx/chip.c

+33 −30
Original line number Diff line number Diff line
@@ -216,6 +216,28 @@ static int mv88e6xxx_write(struct mv88e6xxx_chip *chip, 
	return 0;

}



static int mv88e6xxx_wait(struct mv88e6xxx_chip *chip, int addr, int reg,

			  u16 mask)

{

	unsigned long timeout = jiffies + HZ / 10;



	while (time_before(jiffies, timeout)) {

		u16 val;

		int err;



		err = mv88e6xxx_read(chip, addr, reg, &val);

		if (err)

			return err;



		if (!(val & mask))

			return 0;



		usleep_range(1000, 2000);

	}



	return -ETIMEDOUT;

}



/* Indirect write to single pointer-data register with an Update bit */

static int mv88e6xxx_update(struct mv88e6xxx_chip *chip, int addr, int reg,

			    u16 update)
@@ -819,34 +841,15 @@ static void mv88e6xxx_get_regs(struct dsa_switch *ds, int port, 
	mutex_unlock(&chip->reg_lock);

}



static int _mv88e6xxx_wait(struct mv88e6xxx_chip *chip, int reg, int offset,

			   u16 mask)

{

	unsigned long timeout = jiffies + HZ / 10;



	while (time_before(jiffies, timeout)) {

		int ret;



		ret = _mv88e6xxx_reg_read(chip, reg, offset);

		if (ret < 0)

			return ret;

		if (!(ret & mask))

			return 0;



		usleep_range(1000, 2000);

	}

	return -ETIMEDOUT;

}



static int mv88e6xxx_mdio_wait(struct mv88e6xxx_chip *chip)

{

	return _mv88e6xxx_wait(chip, REG_GLOBAL2, GLOBAL2_SMI_OP,

	return mv88e6xxx_wait(chip, REG_GLOBAL2, GLOBAL2_SMI_OP,

			      GLOBAL2_SMI_OP_BUSY);

}



static int _mv88e6xxx_atu_wait(struct mv88e6xxx_chip *chip)

{

	return _mv88e6xxx_wait(chip, REG_GLOBAL, GLOBAL_ATU_OP,

	return mv88e6xxx_wait(chip, REG_GLOBAL, GLOBAL_ATU_OP,

			      GLOBAL_ATU_OP_BUSY);

}
@@ -1227,7 +1230,7 @@ static int _mv88e6xxx_port_pvid_set(struct mv88e6xxx_chip *chip, 


static int _mv88e6xxx_vtu_wait(struct mv88e6xxx_chip *chip)

{

	return _mv88e6xxx_wait(chip, REG_GLOBAL, GLOBAL_VTU_OP,

	return mv88e6xxx_wait(chip, REG_GLOBAL, GLOBAL_VTU_OP,

			      GLOBAL_VTU_OP_BUSY);

}
@@ -2949,7 +2952,7 @@ static int mv88e6xxx_g2_clear_irl(struct mv88e6xxx_chip *chip) 
			break;



		/* Wait for the operation to complete */

		err = _mv88e6xxx_wait(chip, REG_GLOBAL2, GLOBAL2_IRL_CMD,

		err = mv88e6xxx_wait(chip, REG_GLOBAL2, GLOBAL2_IRL_CMD,

				     GLOBAL2_IRL_CMD_BUSY);

		if (err)

			break;
@@ -3004,7 +3007,7 @@ static int mv88e6xxx_g2_clear_pot(struct mv88e6xxx_chip *chip) 


static int mv88e6xxx_g2_eeprom_wait(struct mv88e6xxx_chip *chip)

{

	return _mv88e6xxx_wait(chip, REG_GLOBAL2, GLOBAL2_EEPROM_CMD,

	return mv88e6xxx_wait(chip, REG_GLOBAL2, GLOBAL2_EEPROM_CMD,

			      GLOBAL2_EEPROM_CMD_BUSY |

			      GLOBAL2_EEPROM_CMD_RUNNING);

}