hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: dsa: lan9303: lan9303_csr_reg_wait cleanups 

Non-functional cleanups in lan9303_csr_reg_wait():
 - Change type of param 'mask' from int to u32.
 - Remove param 'value' (will probably never be used)
 - Reduced retries from 1000 to 25, consistent with lan9303_read_wait.
 - Removed comments

Signed-off-by: Egil Hjelmeland <privat@egil-hjelmeland.no>

Changes v1 -> v2:
 - Removed comments
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Egil Hjelmeland 2017-12-21 18:34:35 +01:00 committed by David S. Miller
parent 09ee9dba96
commit 595476cb67
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/dsa/lan9303-core.c
View File

@ -249,7 +249,6 @@ static int lan9303_read(struct regmap *regmap, unsigned int offset, u32 *reg)
return -EIO; return -EIO;
} }
/* Wait a while until mask & reg == value. Otherwise return timeout. */
static int lan9303_read_wait(struct lan9303 *chip, int offset, u32 mask) static int lan9303_read_wait(struct lan9303 *chip, int offset, u32 mask)
{ {
int i; int i;
@ -541,20 +540,19 @@ lan9303_alr_cache_find_mac(struct lan9303 *chip, const u8 *mac_addr)
return NULL; return NULL;
} }
/* Wait a while until mask & reg == value. Otherwise return timeout. */ static int lan9303_csr_reg_wait(struct lan9303 *chip, int regno, u32 mask)
static int lan9303_csr_reg_wait(struct lan9303 *chip, int regno,
int mask, char value)
{ {
int i; int i;
for (i = 0; i < 0x1000; i++) { for (i = 0; i < 25; i++) {
u32 reg; u32 reg;
lan9303_read_switch_reg(chip, regno, &reg); lan9303_read_switch_reg(chip, regno, &reg);
if ((reg & mask) == value) if (!(reg & mask))
return 0; return 0;
usleep_range(1000, 2000); usleep_range(1000, 2000);
} }
return -ETIMEDOUT; return -ETIMEDOUT;
} }
@ -564,8 +562,7 @@ static int lan9303_alr_make_entry_raw(struct lan9303 *chip, u32 dat0, u32 dat1)
lan9303_write_switch_reg(chip, LAN9303_SWE_ALR_WR_DAT_1, dat1); lan9303_write_switch_reg(chip, LAN9303_SWE_ALR_WR_DAT_1, dat1);
lan9303_write_switch_reg(chip, LAN9303_SWE_ALR_CMD, lan9303_write_switch_reg(chip, LAN9303_SWE_ALR_CMD,
LAN9303_ALR_CMD_MAKE_ENTRY); LAN9303_ALR_CMD_MAKE_ENTRY);
lan9303_csr_reg_wait(chip, LAN9303_SWE_ALR_CMD_STS, ALR_STS_MAKE_PEND, lan9303_csr_reg_wait(chip, LAN9303_SWE_ALR_CMD_STS, ALR_STS_MAKE_PEND);
0);
lan9303_write_switch_reg(chip, LAN9303_SWE_ALR_CMD, 0); lan9303_write_switch_reg(chip, LAN9303_SWE_ALR_CMD, 0);
return 0; return 0;