Commit 5d24da1e authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: keep CMODE writable code private 



This is a follow-up patch for commit 7a3007d2 ("net: dsa:
mv88e6xxx: fully support SERDES on Topaz family").

Since .port_set_cmode is only called from mv88e6xxx_port_setup_mac and
mv88e6xxx_phylink_mac_config, it is fine to keep this "make writable"
code private to the mv88e6341_port_set_cmode implementation, instead
of adding yet another operation to the switch info structure.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@gmail.com>
Reviewed-by: default avatarMarek Behún <marek.behun@nic.cz>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b98f0f53

drivers/net/dsa/mv88e6xxx/chip.c

+0 −8
Original line number Diff line number Diff line
@@ -454,12 +454,6 @@ int mv88e6xxx_port_setup_mac(struct mv88e6xxx_chip *chip, int port, int link, 
			goto restore_link;

	}



	if (chip->info->ops->port_set_cmode_writable) {

		err = chip->info->ops->port_set_cmode_writable(chip, port);

		if (err && err != -EOPNOTSUPP)

			goto restore_link;

	}



	if (chip->info->ops->port_set_cmode) {

		err = chip->info->ops->port_set_cmode(chip, port, mode);

		if (err && err != -EOPNOTSUPP)
@@ -2919,7 +2913,6 @@ static const struct mv88e6xxx_ops mv88e6141_ops = { 
	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,

	.port_link_state = mv88e6352_port_link_state,

	.port_get_cmode = mv88e6352_port_get_cmode,

	.port_set_cmode_writable = mv88e6341_port_set_cmode_writable,

	.port_set_cmode = mv88e6341_port_set_cmode,

	.port_setup_message_port = mv88e6xxx_setup_message_port,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,
@@ -3618,7 +3611,6 @@ static const struct mv88e6xxx_ops mv88e6341_ops = { 
	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,

	.port_link_state = mv88e6352_port_link_state,

	.port_get_cmode = mv88e6352_port_get_cmode,

	.port_set_cmode_writable = mv88e6341_port_set_cmode_writable,

	.port_set_cmode = mv88e6341_port_set_cmode,

	.port_setup_message_port = mv88e6xxx_setup_message_port,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,

drivers/net/dsa/mv88e6xxx/chip.h

+0 −1
Original line number Diff line number Diff line
@@ -400,7 +400,6 @@ struct mv88e6xxx_ops { 
	/* CMODE control what PHY mode the MAC will use, eg. SGMII, RGMII, etc.

	 * Some chips allow this to be configured on specific ports.

	 */

	int (*port_set_cmode_writable)(struct mv88e6xxx_chip *chip, int port);

	int (*port_set_cmode)(struct mv88e6xxx_chip *chip, int port,

			      phy_interface_t mode);

	int (*port_get_cmode)(struct mv88e6xxx_chip *chip, int port, u8 *cmode);

drivers/net/dsa/mv88e6xxx/port.c

+8 −1
Original line number Diff line number Diff line
@@ -510,7 +510,8 @@ int mv88e6390_port_set_cmode(struct mv88e6xxx_chip *chip, int port, 
	return mv88e6xxx_port_set_cmode(chip, port, mode);

}



int mv88e6341_port_set_cmode_writable(struct mv88e6xxx_chip *chip, int port)

static int mv88e6341_port_set_cmode_writable(struct mv88e6xxx_chip *chip,

					     int port)

{

	int err, addr;

	u16 reg, bits;
@@ -537,6 +538,8 @@ int mv88e6341_port_set_cmode_writable(struct mv88e6xxx_chip *chip, int port) 
int mv88e6341_port_set_cmode(struct mv88e6xxx_chip *chip, int port,

			     phy_interface_t mode)

{

	int err;



	if (port != 5)

		return -EOPNOTSUPP;
@@ -551,6 +554,10 @@ int mv88e6341_port_set_cmode(struct mv88e6xxx_chip *chip, int port, 
		break;

	}



	err = mv88e6341_port_set_cmode_writable(chip, port);

	if (err)

		return err;



	return mv88e6xxx_port_set_cmode(chip, port, mode);

}

drivers/net/dsa/mv88e6xxx/port.h

+0 −1
Original line number Diff line number Diff line
@@ -336,7 +336,6 @@ int mv88e6097_port_pause_limit(struct mv88e6xxx_chip *chip, int port, u8 in, 
			       u8 out);

int mv88e6390_port_pause_limit(struct mv88e6xxx_chip *chip, int port, u8 in,

			       u8 out);

int mv88e6341_port_set_cmode_writable(struct mv88e6xxx_chip *chip, int port);

int mv88e6341_port_set_cmode(struct mv88e6xxx_chip *chip, int port,

			     phy_interface_t mode);

int mv88e6390_port_set_cmode(struct mv88e6xxx_chip *chip, int port,

CRA Git | Maintained and supported by SUSTech CRA and CCSE