From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Lunn Subject: [PATCH net-next 06/13] net: dsa: mv88e6xxx: Rename sgmii/10g power functions Date: Thu, 9 Aug 2018 15:38:42 +0200 Message-ID: <1533821929-20071-7-git-send-email-andrew@lunn.ch> References: <1533821929-20071-1-git-send-email-andrew@lunn.ch> Cc: netdev , Russell King , Florian Fainelli , nikita.yoush@cogentembedded.com, Chris Healy , marek.behun@nic.cz, Andrew Lunn To: David Miller Return-path: Received: from vps0.lunn.ch ([185.16.172.187]:59827 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730090AbeHIQHP (ORCPT ); Thu, 9 Aug 2018 12:07:15 -0400 In-Reply-To: <1533821929-20071-1-git-send-email-andrew@lunn.ch> Sender: netdev-owner@vger.kernel.org List-ID: There is a need to add more functions manipulating the SERDES interfaces. Cleanup the namespace. Signed-off-by: Andrew Lunn --- drivers/net/dsa/mv88e6xxx/serdes.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/serdes.c b/drivers/net/dsa/mv88e6xxx/serdes.c index c534749fb1b6..496d422170ef 100644 --- a/drivers/net/dsa/mv88e6xxx/serdes.c +++ b/drivers/net/dsa/mv88e6xxx/serdes.c @@ -294,7 +294,8 @@ static int mv88e6390x_serdes_get_lane(struct mv88e6xxx_chip *chip, int port) } /* Set the power on/off for 10GBASE-R and 10GBASE-X4/X2 */ -static int mv88e6390_serdes_10g(struct mv88e6xxx_chip *chip, int lane, bool on) +static int mv88e6390_serdes_power_10g(struct mv88e6xxx_chip *chip, int lane, + bool on) { u16 val, new_val; int reg_c45; @@ -320,8 +321,8 @@ static int mv88e6390_serdes_10g(struct mv88e6xxx_chip *chip, int lane, bool on) } /* Set the power on/off for SGMII and 1000Base-X */ -static int mv88e6390_serdes_sgmii(struct mv88e6xxx_chip *chip, int lane, - bool on) +static int mv88e6390_serdes_power_sgmii(struct mv88e6xxx_chip *chip, int lane, + bool on) { u16 val, new_val; int reg_c45; @@ -359,11 +360,11 @@ static int mv88e6390_serdes_power_lane(struct mv88e6xxx_chip *chip, int port, switch (cmode) { case MV88E6XXX_PORT_STS_CMODE_SGMII: case MV88E6XXX_PORT_STS_CMODE_1000BASE_X: - return mv88e6390_serdes_sgmii(chip, lane, on); + return mv88e6390_serdes_power_sgmii(chip, lane, on); case MV88E6XXX_PORT_STS_CMODE_XAUI: case MV88E6XXX_PORT_STS_CMODE_RXAUI: case MV88E6XXX_PORT_STS_CMODE_2500BASEX: - return mv88e6390_serdes_10g(chip, lane, on); + return mv88e6390_serdes_power_10g(chip, lane, on); } return 0; @@ -424,7 +425,8 @@ int mv88e6341_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on) if (cmode == MV88E6XXX_PORT_STS_CMODE_1000BASE_X || cmode == MV88E6XXX_PORT_STS_CMODE_SGMII || cmode == MV88E6XXX_PORT_STS_CMODE_2500BASEX) - return mv88e6390_serdes_sgmii(chip, MV88E6341_ADDR_SERDES, on); + return mv88e6390_serdes_power_sgmii(chip, MV88E6341_ADDR_SERDES, + on); return 0; } -- 2.18.0