1. Refactor mv88e6352_g2_scratch_port_has_serdes to use the cached scratch config3 value instead of reading it everytime. 2. Remove err<0 check from mv88e6352_phylink_get_caps as it is never true anymore Co-developed-by: Thomas Eckerman Signed-off-by: Thomas Eckerman Signed-off-by: Fidan Aliyeva --- drivers/net/dsa/mv88e6xxx/chip.c | 3 --- drivers/net/dsa/mv88e6xxx/global2_scratch.c | 18 ++++++------------ 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 4ed6f880e02c..63cdcce3d8c7 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -685,9 +685,6 @@ static void mv88e6352_phylink_get_caps(struct mv88e6xxx_chip *chip, int port, /* Port 4 supports automedia if the serdes is associated with it. */ if (port == 4) { err = mv88e6352_g2_scratch_port_has_serdes(chip, port); - if (err < 0) - dev_err(chip->dev, "p%d: failed to read scratch\n", - port); if (err <= 0) return; diff --git a/drivers/net/dsa/mv88e6xxx/global2_scratch.c b/drivers/net/dsa/mv88e6xxx/global2_scratch.c index f2f9e7dce1aa..f292ee4db113 100644 --- a/drivers/net/dsa/mv88e6xxx/global2_scratch.c +++ b/drivers/net/dsa/mv88e6xxx/global2_scratch.c @@ -348,26 +348,20 @@ int mv88e6352_g2_cache_global_scratch_config3(struct mv88e6xxx_chip *chip) } /** - * mv88e6352_g2_scratch_port_has_serdes - indicate if a port can have a serdes + * mv88e6352_g2_scratch_port_has_serdes - indicate if a port has serdes * @chip: chip private data * @port: port number to check for serdes * * Indicates whether the port may have a serdes attached according to the - * pin strapping. Returns negative error number, 0 if the port is not - * configured to have a serdes, and 1 if the port is configured to have a - * serdes attached. + * pin strapping, which is cached at reset (scratch config3). Returns 0 if + * the port is not configured to have a serdes, and 1 if the port is + * configured to have a serdes attached. */ int mv88e6352_g2_scratch_port_has_serdes(struct mv88e6xxx_chip *chip, int port) { - u8 config3, p; - int err; - - err = mv88e6xxx_g2_scratch_read(chip, MV88E6352_G2_SCRATCH_CONFIG_DATA3, - &config3); - if (err) - return err; + u8 p; - if (config3 & MV88E6352_G2_SCRATCH_CONFIG_DATA3_S_SEL) + if (chip->g2_scratch_config3 & MV88E6352_G2_SCRATCH_CONFIG_DATA3_S_SEL) p = 5; else p = 4; -- 2.36.0