Commit 5f1b7f83 authored by Oleksij Rempel's avatar Oleksij Rempel Committed by Jakub Kicinski

net: dsa: microchip: ksz8: Refactor ksz8_r_dyn_mac_table() for readability

Move the code out of a long if statement scope in ksz8_r_dyn_mac_table()
to improve code readability.
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Acked-by: default avatarArun Ramadoss <arun.ramadoss@microchip.com>
Signed-off-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Link: https://lore.kernel.org/r/20240403125039.3414824-5-o.rempel@pengutronix.deSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 0499bb09
...@@ -416,7 +416,9 @@ static int ksz8_r_dyn_mac_table(struct ksz_device *dev, u16 addr, u8 *mac_addr, ...@@ -416,7 +416,9 @@ static int ksz8_r_dyn_mac_table(struct ksz_device *dev, u16 addr, u8 *mac_addr,
const u32 *masks; const u32 *masks;
const u16 *regs; const u16 *regs;
u16 ctrl_addr; u16 ctrl_addr;
u64 buf = 0;
u8 data; u8 data;
int cnt;
int rc; int rc;
shifts = dev->info->shifts; shifts = dev->info->shifts;
...@@ -432,12 +434,11 @@ static int ksz8_r_dyn_mac_table(struct ksz_device *dev, u16 addr, u8 *mac_addr, ...@@ -432,12 +434,11 @@ static int ksz8_r_dyn_mac_table(struct ksz_device *dev, u16 addr, u8 *mac_addr,
if (rc == -EAGAIN) { if (rc == -EAGAIN) {
if (addr == 0) if (addr == 0)
*entries = 0; *entries = 0;
goto unlock_alu;
} else if (rc == -ENXIO) { } else if (rc == -ENXIO) {
*entries = 0; *entries = 0;
/* At least one valid entry in the table. */ goto unlock_alu;
} else { }
u64 buf = 0;
int cnt;
ksz_read64(dev, regs[REG_IND_DATA_HI], &buf); ksz_read64(dev, regs[REG_IND_DATA_HI], &buf);
data_hi = (u32)(buf >> 32); data_hi = (u32)(buf >> 32);
...@@ -463,7 +464,8 @@ static int ksz8_r_dyn_mac_table(struct ksz_device *dev, u16 addr, u8 *mac_addr, ...@@ -463,7 +464,8 @@ static int ksz8_r_dyn_mac_table(struct ksz_device *dev, u16 addr, u8 *mac_addr,
mac_addr[1] = (u8)data_hi; mac_addr[1] = (u8)data_hi;
mac_addr[0] = (u8)(data_hi >> 8); mac_addr[0] = (u8)(data_hi >> 8);
rc = 0; rc = 0;
}
unlock_alu:
mutex_unlock(&dev->alu_mutex); mutex_unlock(&dev->alu_mutex);
return rc; return rc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment