GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: dsa: rename switch operations structure

Browse source 
Now that the dsa_switch_driver structure contains only function pointers
as it is supposed to, rename it to the more appropriate dsa_switch_ops,
uniformly to any other operations structure in the kernel.

No functional changes here, basically just the result of something like:
s/dsa_switch_driver *drv/dsa_switch_ops *ops/g

However keep the {un,}register_switch_driver functions and their
dsa_switch_drivers list as is, since they represent the -- likely to be
deprecated soon -- legacy DSA registration framework.

In the meantime, also fix the following checks from checkpatch.pl to
make it happy with this patch:

    CHECK: Comparison to NULL could be written "!ops"
    #403: FILE: net/dsa/dsa.c:470:
    +	if (ops == NULL) {

    CHECK: Comparison to NULL could be written "ds->ops->get_strings"
    #773: FILE: net/dsa/slave.c:697:
    +		if (ds->ops->get_strings != NULL)

    CHECK: Comparison to NULL could be written "ds->ops->get_ethtool_stats"
    #824: FILE: net/dsa/slave.c:785:
    +	if (ds->ops->get_ethtool_stats != NULL)

    CHECK: Comparison to NULL could be written "ds->ops->get_sset_count"
    #835: FILE: net/dsa/slave.c:798:
    +		if (ds->ops->get_sset_count != NULL)

    total: 0 errors, 0 warnings, 4 checks, 784 lines checked

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vivien Didelot 2016-08-23 12:38:56 -04:00 • committed by David S. Miller
parent c7b7b483cc
commit 9d490b4ee4
9 changed files with 137 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

146
net/dsa/slave.c
View file

@ -28,7 +28,7 @@ static int dsa_slave_phy_read(struct mii_bus *bus, int addr, int reg)
struct dsa_switch *ds = bus->priv;
if (ds->phys_mii_mask & (1 << addr))
return ds->drv->phy_read(ds, addr, reg);
return ds->ops->phy_read(ds, addr, reg);
return 0xffff;
}
@ -38,7 +38,7 @@ static int dsa_slave_phy_write(struct mii_bus *bus, int addr, int reg, u16 val)
struct dsa_switch *ds = bus->priv;
if (ds->phys_mii_mask & (1 << addr))
return ds->drv->phy_write(ds, addr, reg, val);
return ds->ops->phy_write(ds, addr, reg, val);
return 0;
}
@ -98,14 +98,14 @@ static int dsa_slave_open(struct net_device *dev)
goto clear_allmulti;
}
if (ds->drv->port_enable) {
err = ds->drv->port_enable(ds, p->port, p->phy);
if (ds->ops->port_enable) {
err = ds->ops->port_enable(ds, p->port, p->phy);
if (err)
goto clear_promisc;
}
if (ds->drv->port_stp_state_set)
ds->drv->port_stp_state_set(ds, p->port, stp_state);
if (ds->ops->port_stp_state_set)
ds->ops->port_stp_state_set(ds, p->port, stp_state);
if (p->phy)
phy_start(p->phy);
@ -144,11 +144,11 @@ static int dsa_slave_close(struct net_device *dev)
if (!ether_addr_equal(dev->dev_addr, master->dev_addr))
dev_uc_del(master, dev->dev_addr);
if (ds->drv->port_disable)
ds->drv->port_disable(ds, p->port, p->phy);
if (ds->ops->port_disable)
ds->ops->port_disable(ds, p->port, p->phy);
if (ds->drv->port_stp_state_set)
ds->drv->port_stp_state_set(ds, p->port, BR_STATE_DISABLED);
if (ds->ops->port_stp_state_set)
ds->ops->port_stp_state_set(ds, p->port, BR_STATE_DISABLED);
return 0;
}
@ -209,13 +209,13 @@ static int dsa_slave_port_vlan_add(struct net_device *dev,
struct dsa_switch *ds = p->parent;
if (switchdev_trans_ph_prepare(trans)) {
if (!ds->drv->port_vlan_prepare || !ds->drv->port_vlan_add)
if (!ds->ops->port_vlan_prepare || !ds->ops->port_vlan_add)
return -EOPNOTSUPP;
return ds->drv->port_vlan_prepare(ds, p->port, vlan, trans);
return ds->ops->port_vlan_prepare(ds, p->port, vlan, trans);
}
ds->drv->port_vlan_add(ds, p->port, vlan, trans);
ds->ops->port_vlan_add(ds, p->port, vlan, trans);
return 0;
}
@ -226,10 +226,10 @@ static int dsa_slave_port_vlan_del(struct net_device *dev,
struct dsa_slave_priv *p = netdev_priv(dev);
struct dsa_switch *ds = p->parent;
if (!ds->drv->port_vlan_del)
if (!ds->ops->port_vlan_del)
return -EOPNOTSUPP;
return ds->drv->port_vlan_del(ds, p->port, vlan);
return ds->ops->port_vlan_del(ds, p->port, vlan);
}
static int dsa_slave_port_vlan_dump(struct net_device *dev,
@ -239,8 +239,8 @@ static int dsa_slave_port_vlan_dump(struct net_device *dev,
struct dsa_slave_priv *p = netdev_priv(dev);
struct dsa_switch *ds = p->parent;
if (ds->drv->port_vlan_dump)
return ds->drv->port_vlan_dump(ds, p->port, vlan, cb);
if (ds->ops->port_vlan_dump)
return ds->ops->port_vlan_dump(ds, p->port, vlan, cb);
return -EOPNOTSUPP;
}
@ -253,13 +253,13 @@ static int dsa_slave_port_fdb_add(struct net_device *dev,
struct dsa_switch *ds = p->parent;
if (switchdev_trans_ph_prepare(trans)) {
if (!ds->drv->port_fdb_prepare || !ds->drv->port_fdb_add)
if (!ds->ops->port_fdb_prepare || !ds->ops->port_fdb_add)
return -EOPNOTSUPP;
return ds->drv->port_fdb_prepare(ds, p->port, fdb, trans);
return ds->ops->port_fdb_prepare(ds, p->port, fdb, trans);
}
ds->drv->port_fdb_add(ds, p->port, fdb, trans);
ds->ops->port_fdb_add(ds, p->port, fdb, trans);
return 0;
}
@ -271,8 +271,8 @@ static int dsa_slave_port_fdb_del(struct net_device *dev,
struct dsa_switch *ds = p->parent;
int ret = -EOPNOTSUPP;
if (ds->drv->port_fdb_del)
ret = ds->drv->port_fdb_del(ds, p->port, fdb);
if (ds->ops->port_fdb_del)
ret = ds->ops->port_fdb_del(ds, p->port, fdb);
return ret;
}
@ -284,8 +284,8 @@ static int dsa_slave_port_fdb_dump(struct net_device *dev,
struct dsa_slave_priv *p = netdev_priv(dev);
struct dsa_switch *ds = p->parent;
if (ds->drv->port_fdb_dump)
return ds->drv->port_fdb_dump(ds, p->port, fdb, cb);
if (ds->ops->port_fdb_dump)
return ds->ops->port_fdb_dump(ds, p->port, fdb, cb);
return -EOPNOTSUPP;
}
@ -308,9 +308,9 @@ static int dsa_slave_stp_state_set(struct net_device *dev,
struct dsa_switch *ds = p->parent;
if (switchdev_trans_ph_prepare(trans))
return ds->drv->port_stp_state_set ? 0 : -EOPNOTSUPP;
return ds->ops->port_stp_state_set ? 0 : -EOPNOTSUPP;
ds->drv->port_stp_state_set(ds, p->port, attr->u.stp_state);
ds->ops->port_stp_state_set(ds, p->port, attr->u.stp_state);
return 0;
}
@ -326,8 +326,8 @@ static int dsa_slave_vlan_filtering(struct net_device *dev,
if (switchdev_trans_ph_prepare(trans))
return 0;
if (ds->drv->port_vlan_filtering)
return ds->drv->port_vlan_filtering(ds, p->port,
if (ds->ops->port_vlan_filtering)
return ds->ops->port_vlan_filtering(ds, p->port,
attr->u.vlan_filtering);
return 0;
@ -365,8 +365,8 @@ static int dsa_slave_ageing_time(struct net_device *dev,
ds->ports[p->port].ageing_time = ageing_time;
ageing_time = dsa_fastest_ageing_time(ds, ageing_time);
if (ds->drv->set_ageing_time)
return ds->drv->set_ageing_time(ds, ageing_time);
if (ds->ops->set_ageing_time)
return ds->ops->set_ageing_time(ds, ageing_time);
return 0;
}
@ -481,8 +481,8 @@ static int dsa_slave_bridge_port_join(struct net_device *dev,
p->bridge_dev = br;
if (ds->drv->port_bridge_join)
ret = ds->drv->port_bridge_join(ds, p->port, br);
if (ds->ops->port_bridge_join)
ret = ds->ops->port_bridge_join(ds, p->port, br);
return ret == -EOPNOTSUPP ? 0 : ret;
}
@ -493,16 +493,16 @@ static void dsa_slave_bridge_port_leave(struct net_device *dev)
struct dsa_switch *ds = p->parent;
if (ds->drv->port_bridge_leave)
ds->drv->port_bridge_leave(ds, p->port);
if (ds->ops->port_bridge_leave)
ds->ops->port_bridge_leave(ds, p->port);
p->bridge_dev = NULL;
/* Port left the bridge, put in BR_STATE_DISABLED by the bridge layer,
* so allow it to be in BR_STATE_FORWARDING to be kept functional
*/
if (ds->drv->port_stp_state_set)
ds->drv->port_stp_state_set(ds, p->port, BR_STATE_FORWARDING);
if (ds->ops->port_stp_state_set)
ds->ops->port_stp_state_set(ds, p->port, BR_STATE_FORWARDING);
}
static int dsa_slave_port_attr_get(struct net_device *dev,
@ -605,8 +605,8 @@ static int dsa_slave_get_regs_len(struct net_device *dev)
struct dsa_slave_priv *p = netdev_priv(dev);
struct dsa_switch *ds = p->parent;
if (ds->drv->get_regs_len)
return ds->drv->get_regs_len(ds, p->port);
if (ds->ops->get_regs_len)
return ds->ops->get_regs_len(ds, p->port);
return -EOPNOTSUPP;
}
@ -617,8 +617,8 @@ dsa_slave_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *_p)
struct dsa_slave_priv *p = netdev_priv(dev);
struct dsa_switch *ds = p->parent;
if (ds->drv->get_regs)
ds->drv->get_regs(ds, p->port, regs, _p);
if (ds->ops->get_regs)
ds->ops->get_regs(ds, p->port, regs, _p);
}
static int dsa_slave_nway_reset(struct net_device *dev)
@ -651,8 +651,8 @@ static int dsa_slave_get_eeprom_len(struct net_device *dev)
if (ds->cd && ds->cd->eeprom_len)
return ds->cd->eeprom_len;
if (ds->drv->get_eeprom_len)
return ds->drv->get_eeprom_len(ds);
if (ds->ops->get_eeprom_len)
return ds->ops->get_eeprom_len(ds);
return 0;
}
@ -663,8 +663,8 @@ static int dsa_slave_get_eeprom(struct net_device *dev,
struct dsa_slave_priv *p = netdev_priv(dev);
struct dsa_switch *ds = p->parent;
if (ds->drv->get_eeprom)
return ds->drv->get_eeprom(ds, eeprom, data);
if (ds->ops->get_eeprom)
return ds->ops->get_eeprom(ds, eeprom, data);
return -EOPNOTSUPP;
}
@ -675,8 +675,8 @@ static int dsa_slave_set_eeprom(struct net_device *dev,
struct dsa_slave_priv *p = netdev_priv(dev);
struct dsa_switch *ds = p->parent;
if (ds->drv->set_eeprom)
return ds->drv->set_eeprom(ds, eeprom, data);
if (ds->ops->set_eeprom)
return ds->ops->set_eeprom(ds, eeprom, data);
return -EOPNOTSUPP;
}
@ -694,8 +694,8 @@ static void dsa_slave_get_strings(struct net_device *dev,
strncpy(data + len, "tx_bytes", len);
strncpy(data + 2 * len, "rx_packets", len);
strncpy(data + 3 * len, "rx_bytes", len);
if (ds->drv->get_strings != NULL)
ds->drv->get_strings(ds, p->port, data + 4 * len);
if (ds->ops->get_strings)
ds->ops->get_strings(ds, p->port, data + 4 * len);
}
}
@ -714,8 +714,8 @@ static void dsa_cpu_port_get_ethtool_stats(struct net_device *dev,
dst->master_ethtool_ops.get_ethtool_stats(dev, stats, data);
}
if (ds->drv->get_ethtool_stats)
ds->drv->get_ethtool_stats(ds, cpu_port, data + count);
if (ds->ops->get_ethtool_stats)
ds->ops->get_ethtool_stats(ds, cpu_port, data + count);
}
static int dsa_cpu_port_get_sset_count(struct net_device *dev, int sset)
@ -727,8 +727,8 @@ static int dsa_cpu_port_get_sset_count(struct net_device *dev, int sset)
if (dst->master_ethtool_ops.get_sset_count)
count += dst->master_ethtool_ops.get_sset_count(dev, sset);
if (sset == ETH_SS_STATS && ds->drv->get_sset_count)
count += ds->drv->get_sset_count(ds);
if (sset == ETH_SS_STATS && ds->ops->get_sset_count)
count += ds->ops->get_sset_count(ds);
return count;
}
@ -755,14 +755,14 @@ static void dsa_cpu_port_get_strings(struct net_device *dev,
dst->master_ethtool_ops.get_strings(dev, stringset, data);
}
if (stringset == ETH_SS_STATS && ds->drv->get_strings) {
if (stringset == ETH_SS_STATS && ds->ops->get_strings) {
ndata = data + mcount * len;
/* This function copies ETH_GSTRINGS_LEN bytes, we will mangle
* the output after to prepend our CPU port prefix we
* constructed earlier
*/
ds->drv->get_strings(ds, cpu_port, ndata);
count = ds->drv->get_sset_count(ds);
ds->ops->get_strings(ds, cpu_port, ndata);
count = ds->ops->get_sset_count(ds);
for (i = 0; i < count; i++) {
memmove(ndata + (i * len + sizeof(pfx)),
ndata + i * len, len - sizeof(pfx));
@ -782,8 +782,8 @@ static void dsa_slave_get_ethtool_stats(struct net_device *dev,
data[1] = dev->stats.tx_bytes;
data[2] = dev->stats.rx_packets;
data[3] = dev->stats.rx_bytes;
if (ds->drv->get_ethtool_stats != NULL)
ds->drv->get_ethtool_stats(ds, p->port, data + 4);
if (ds->ops->get_ethtool_stats)
ds->ops->get_ethtool_stats(ds, p->port, data + 4);
}
static int dsa_slave_get_sset_count(struct net_device *dev, int sset)
@ -795,8 +795,8 @@ static int dsa_slave_get_sset_count(struct net_device *dev, int sset)
int count;
count = 4;
if (ds->drv->get_sset_count != NULL)
count += ds->drv->get_sset_count(ds);
if (ds->ops->get_sset_count)
count += ds->ops->get_sset_count(ds);
return count;
}
@ -809,8 +809,8 @@ static void dsa_slave_get_wol(struct net_device *dev, struct ethtool_wolinfo *w)
struct dsa_slave_priv *p = netdev_priv(dev);
struct dsa_switch *ds = p->parent;
if (ds->drv->get_wol)
ds->drv->get_wol(ds, p->port, w);
if (ds->ops->get_wol)
ds->ops->get_wol(ds, p->port, w);
}
static int dsa_slave_set_wol(struct net_device *dev, struct ethtool_wolinfo *w)
@ -819,8 +819,8 @@ static int dsa_slave_set_wol(struct net_device *dev, struct ethtool_wolinfo *w)
struct dsa_switch *ds = p->parent;
int ret = -EOPNOTSUPP;
if (ds->drv->set_wol)
ret = ds->drv->set_wol(ds, p->port, w);
if (ds->ops->set_wol)
ret = ds->ops->set_wol(ds, p->port, w);
return ret;
}
@ -831,10 +831,10 @@ static int dsa_slave_set_eee(struct net_device *dev, struct ethtool_eee *e)
struct dsa_switch *ds = p->parent;
int ret;
if (!ds->drv->set_eee)
if (!ds->ops->set_eee)
return -EOPNOTSUPP;
ret = ds->drv->set_eee(ds, p->port, p->phy, e);
ret = ds->ops->set_eee(ds, p->port, p->phy, e);
if (ret)
return ret;
@ -850,10 +850,10 @@ static int dsa_slave_get_eee(struct net_device *dev, struct ethtool_eee *e)
struct dsa_switch *ds = p->parent;
int ret;
if (!ds->drv->get_eee)
if (!ds->ops->get_eee)
return -EOPNOTSUPP;
ret = ds->drv->get_eee(ds, p->port, e);
ret = ds->ops->get_eee(ds, p->port, e);
if (ret)
return ret;
@ -988,8 +988,8 @@ static void dsa_slave_adjust_link(struct net_device *dev)
p->old_pause = p->phy->pause;
}
if (ds->drv->adjust_link && status_changed)
ds->drv->adjust_link(ds, p->port, p->phy);
if (ds->ops->adjust_link && status_changed)
ds->ops->adjust_link(ds, p->port, p->phy);
if (status_changed)
phy_print_status(p->phy);
@ -1004,8 +1004,8 @@ static int dsa_slave_fixed_link_update(struct net_device *dev,
if (dev) {
p = netdev_priv(dev);
ds = p->parent;
if (ds->drv->fixed_link_update)
ds->drv->fixed_link_update(ds, p->port, status);
if (ds->ops->fixed_link_update)
ds->ops->fixed_link_update(ds, p->port, status);
}
return 0;
@ -1062,8 +1062,8 @@ static int dsa_slave_phy_setup(struct dsa_slave_priv *p,
phy_dn = port_dn;
}
if (ds->drv->get_phy_flags)
phy_flags = ds->drv->get_phy_flags(ds, p->port);
if (ds->ops->get_phy_flags)
phy_flags = ds->ops->get_phy_flags(ds, p->port);
if (phy_dn) {
int phy_id = of_mdio_parse_addr(&slave_dev->dev, phy_dn);