Skip to content

Commit 05407b0

Browse files
Russell King (Oracle)davem330
authored andcommitted
net: dsa: mv88e6xxx: export mv88e6xxx_pcs_decode_state()
Rename and export the PCS state decoding function so our PCS can make use of the functionality provided by this. Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent b92143d commit 05407b0

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

drivers/net/dsa/mv88e6xxx/serdes.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@ static int mv88e6390_serdes_write(struct mv88e6xxx_chip *chip,
4545
return mv88e6xxx_phy_write_c45(chip, lane, device, reg, val);
4646
}
4747

48-
static int mv88e6xxx_serdes_pcs_get_state(struct mv88e6xxx_chip *chip,
49-
u16 bmsr, u16 lpa, u16 status,
50-
struct phylink_link_state *state)
48+
int mv88e6xxx_pcs_decode_state(struct device *dev, u16 bmsr, u16 lpa,
49+
u16 status, struct phylink_link_state *state)
5150
{
5251
state->link = false;
5352

@@ -88,7 +87,7 @@ static int mv88e6xxx_serdes_pcs_get_state(struct mv88e6xxx_chip *chip,
8887
state->speed = SPEED_10;
8988
break;
9089
default:
91-
dev_err(chip->dev, "invalid PHY speed\n");
90+
dev_err(dev, "invalid PHY speed\n");
9291
return -EINVAL;
9392
}
9493
} else if (state->link &&
@@ -211,7 +210,7 @@ int mv88e6352_serdes_pcs_get_state(struct mv88e6xxx_chip *chip, int port,
211210
return err;
212211
}
213212

214-
return mv88e6xxx_serdes_pcs_get_state(chip, bmsr, lpa, status, state);
213+
return mv88e6xxx_pcs_decode_state(chip->dev, bmsr, lpa, status, state);
215214
}
216215

217216
int mv88e6352_serdes_pcs_an_restart(struct mv88e6xxx_chip *chip, int port,
@@ -942,7 +941,7 @@ static int mv88e6390_serdes_pcs_get_state_sgmii(struct mv88e6xxx_chip *chip,
942941
return err;
943942
}
944943

945-
return mv88e6xxx_serdes_pcs_get_state(chip, bmsr, lpa, status, state);
944+
return mv88e6xxx_pcs_decode_state(chip->dev, bmsr, lpa, status, state);
946945
}
947946

948947
static int mv88e6390_serdes_pcs_get_state_10g(struct mv88e6xxx_chip *chip,

drivers/net/dsa/mv88e6xxx/serdes.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
#include "chip.h"
1414

15+
struct phylink_link_state;
16+
1517
#define MV88E6352_ADDR_SERDES 0x0f
1618
#define MV88E6352_SERDES_PAGE_FIBER 0x01
1719
#define MV88E6352_SERDES_IRQ 0x0b
@@ -107,6 +109,9 @@
107109
#define MV88E6393X_ERRATA_4_8_REG 0xF074
108110
#define MV88E6393X_ERRATA_4_8_BIT BIT(14)
109111

112+
int mv88e6xxx_pcs_decode_state(struct device *dev, u16 bmsr, u16 lpa,
113+
u16 status, struct phylink_link_state *state);
114+
110115
int mv88e6185_serdes_get_lane(struct mv88e6xxx_chip *chip, int port);
111116
int mv88e6341_serdes_get_lane(struct mv88e6xxx_chip *chip, int port);
112117
int mv88e6352_serdes_get_lane(struct mv88e6xxx_chip *chip, int port);

0 commit comments

Comments
 (0)