redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

net: dsa: rename switch EEE ops 

To avoid confusion with the PHY EEE settings, rename the .set_eee and
.get_eee ops to respectively .set_mac_eee and .get_mac_eee.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
hifive-unleashed-5.1
Vivien Didelot 2017-08-01 16:32:41 -04:00 committed by David S. Miller
parent 5480db6985
commit 08f500610f
5 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/dsa/bcm_sf2.c
View File

@ -338,8 +338,8 @@ static int bcm_sf2_eee_init(struct dsa_switch *ds, int port,
return 1; return 1;
} }
static int bcm_sf2_sw_get_eee(struct dsa_switch *ds, int port, static int bcm_sf2_sw_get_mac_eee(struct dsa_switch *ds, int port,
struct ethtool_eee *e) struct ethtool_eee *e)
{ {
struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds); struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
struct ethtool_eee *p = &priv->port_sts[port].eee; struct ethtool_eee *p = &priv->port_sts[port].eee;
@ -352,8 +352,8 @@ static int bcm_sf2_sw_get_eee(struct dsa_switch *ds, int port,
return 0; return 0;
} }
static int bcm_sf2_sw_set_eee(struct dsa_switch *ds, int port, static int bcm_sf2_sw_set_mac_eee(struct dsa_switch *ds, int port,
struct ethtool_eee *e) struct ethtool_eee *e)
{ {
struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds); struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
struct ethtool_eee *p = &priv->port_sts[port].eee; struct ethtool_eee *p = &priv->port_sts[port].eee;
@ -1011,8 +1011,8 @@ static const struct dsa_switch_ops bcm_sf2_ops = {
.set_wol = bcm_sf2_sw_set_wol, .set_wol = bcm_sf2_sw_set_wol,
.port_enable = bcm_sf2_port_setup, .port_enable = bcm_sf2_port_setup,
.port_disable = bcm_sf2_port_disable, .port_disable = bcm_sf2_port_disable,
.get_eee = bcm_sf2_sw_get_eee, .get_mac_eee = bcm_sf2_sw_get_mac_eee,
.set_eee = bcm_sf2_sw_set_eee, .set_mac_eee = bcm_sf2_sw_set_mac_eee,
.port_bridge_join = b53_br_join, .port_bridge_join = b53_br_join,
.port_bridge_leave = b53_br_leave, .port_bridge_leave = b53_br_leave,
.port_stp_state_set = b53_br_set_stp_state, .port_stp_state_set = b53_br_set_stp_state,

12
drivers/net/dsa/mv88e6xxx/chip.c
View File

@ -810,15 +810,15 @@ static void mv88e6xxx_get_regs(struct dsa_switch *ds, int port,
mutex_unlock(&chip->reg_lock); mutex_unlock(&chip->reg_lock);
} }
static int mv88e6xxx_get_eee(struct dsa_switch *ds, int port, static int mv88e6xxx_get_mac_eee(struct dsa_switch *ds, int port,
struct ethtool_eee *e) struct ethtool_eee *e)
{ {
/* Nothing to do on the port's MAC */ /* Nothing to do on the port's MAC */
return 0; return 0;
} }
static int mv88e6xxx_set_eee(struct dsa_switch *ds, int port, static int mv88e6xxx_set_mac_eee(struct dsa_switch *ds, int port,
struct ethtool_eee *e) struct ethtool_eee *e)
{ {
/* Nothing to do on the port's MAC */ /* Nothing to do on the port's MAC */
return 0; return 0;
@ -3890,8 +3890,8 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
.get_sset_count = mv88e6xxx_get_sset_count, .get_sset_count = mv88e6xxx_get_sset_count,
.port_enable = mv88e6xxx_port_enable, .port_enable = mv88e6xxx_port_enable,
.port_disable = mv88e6xxx_port_disable, .port_disable = mv88e6xxx_port_disable,
.set_eee = mv88e6xxx_set_eee, .get_mac_eee = mv88e6xxx_get_mac_eee,
.get_eee = mv88e6xxx_get_eee, .set_mac_eee = mv88e6xxx_set_mac_eee,
.get_eeprom_len = mv88e6xxx_get_eeprom_len, .get_eeprom_len = mv88e6xxx_get_eeprom_len,
.get_eeprom = mv88e6xxx_get_eeprom, .get_eeprom = mv88e6xxx_get_eeprom,
.set_eeprom = mv88e6xxx_set_eeprom, .set_eeprom = mv88e6xxx_set_eeprom,

9
drivers/net/dsa/qca8k.c
View File

@ -638,7 +638,7 @@ qca8k_get_sset_count(struct dsa_switch *ds)
} }
static int static int
qca8k_set_eee(struct dsa_switch *ds, int port, struct ethtool_eee *eee) qca8k_set_mac_eee(struct dsa_switch *ds, int port, struct ethtool_eee *eee)
{ {
struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv; struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;
u32 lpi_en = QCA8K_REG_EEE_CTRL_LPI_EN(port); u32 lpi_en = QCA8K_REG_EEE_CTRL_LPI_EN(port);
@ -657,8 +657,7 @@ qca8k_set_eee(struct dsa_switch *ds, int port, struct ethtool_eee *eee)
} }
static int static int
qca8k_get_eee(struct dsa_switch *ds, int port, qca8k_get_mac_eee(struct dsa_switch *ds, int port, struct ethtool_eee *e)
struct ethtool_eee *e)
{ {
/* Nothing to do on the port's MAC */ /* Nothing to do on the port's MAC */
return 0; return 0;
@ -863,8 +862,8 @@ static const struct dsa_switch_ops qca8k_switch_ops = {
.phy_write = qca8k_phy_write, .phy_write = qca8k_phy_write,
.get_ethtool_stats = qca8k_get_ethtool_stats, .get_ethtool_stats = qca8k_get_ethtool_stats,
.get_sset_count = qca8k_get_sset_count, .get_sset_count = qca8k_get_sset_count,
.get_eee = qca8k_get_eee, .get_mac_eee = qca8k_get_mac_eee,
.set_eee = qca8k_set_eee, .set_mac_eee = qca8k_set_mac_eee,
.port_enable = qca8k_port_enable, .port_enable = qca8k_port_enable,
.port_disable = qca8k_port_disable, .port_disable = qca8k_port_disable,
.port_stp_state_set = qca8k_port_stp_state_set, .port_stp_state_set = qca8k_port_stp_state_set,

10
include/net/dsa.h
View File

@ -332,12 +332,12 @@ struct dsa_switch_ops {
struct phy_device *phy); struct phy_device *phy);
/* /*
* EEE setttings * Port's MAC EEE settings
*/ */
int (*set_eee)(struct dsa_switch *ds, int port, int (*set_mac_eee)(struct dsa_switch *ds, int port,
struct ethtool_eee *e); struct ethtool_eee *e);
int (*get_eee)(struct dsa_switch *ds, int port, int (*get_mac_eee)(struct dsa_switch *ds, int port,
struct ethtool_eee *e); struct ethtool_eee *e);
/* EEPROM access */ /* EEPROM access */
int (*get_eeprom_len)(struct dsa_switch *ds); int (*get_eeprom_len)(struct dsa_switch *ds);

8
net/dsa/slave.c
View File

@ -652,10 +652,10 @@ static int dsa_slave_set_eee(struct net_device *dev, struct ethtool_eee *e)
if (!p->phy) if (!p->phy)
return -ENODEV; return -ENODEV;
if (!ds->ops->set_eee) if (!ds->ops->set_mac_eee)
return -EOPNOTSUPP; return -EOPNOTSUPP;
ret = ds->ops->set_eee(ds, p->dp->index, e); ret = ds->ops->set_mac_eee(ds, p->dp->index, e);
if (ret) if (ret)
return ret; return ret;
@ -678,10 +678,10 @@ static int dsa_slave_get_eee(struct net_device *dev, struct ethtool_eee *e)
if (!p->phy) if (!p->phy)
return -ENODEV; return -ENODEV;
if (!ds->ops->get_eee) if (!ds->ops->get_mac_eee)
return -EOPNOTSUPP; return -EOPNOTSUPP;
ret = ds->ops->get_eee(ds, p->dp->index, e); ret = ds->ops->get_mac_eee(ds, p->dp->index, e);
if (ret) if (ret)
return ret; return ret;