Commit 1d1e79f1 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller

net: dsa: Do not check for ethtool_ops validity

This is completely redundant with what netdev_set_default_ethtool_ops()
does, we are always guaranteed to have a valid dev->ethtool_ops pointer,
however, within that structure, not all function calls may be populated,
so we still have to check them individually.
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 99943382
...@@ -22,7 +22,7 @@ static void dsa_master_get_ethtool_stats(struct net_device *dev, ...@@ -22,7 +22,7 @@ static void dsa_master_get_ethtool_stats(struct net_device *dev,
int port = cpu_dp->index; int port = cpu_dp->index;
int count = 0; int count = 0;
if (ops && ops->get_sset_count && ops->get_ethtool_stats) { if (ops->get_sset_count && ops->get_ethtool_stats) {
count = ops->get_sset_count(dev, ETH_SS_STATS); count = ops->get_sset_count(dev, ETH_SS_STATS);
ops->get_ethtool_stats(dev, stats, data); ops->get_ethtool_stats(dev, stats, data);
} }
...@@ -38,7 +38,7 @@ static int dsa_master_get_sset_count(struct net_device *dev, int sset) ...@@ -38,7 +38,7 @@ static int dsa_master_get_sset_count(struct net_device *dev, int sset)
struct dsa_switch *ds = cpu_dp->ds; struct dsa_switch *ds = cpu_dp->ds;
int count = 0; int count = 0;
if (ops && ops->get_sset_count) if (ops->get_sset_count)
count += ops->get_sset_count(dev, sset); count += ops->get_sset_count(dev, sset);
if (sset == ETH_SS_STATS && ds->ops->get_sset_count) if (sset == ETH_SS_STATS && ds->ops->get_sset_count)
...@@ -64,7 +64,7 @@ static void dsa_master_get_strings(struct net_device *dev, uint32_t stringset, ...@@ -64,7 +64,7 @@ static void dsa_master_get_strings(struct net_device *dev, uint32_t stringset,
/* We do not want to be NULL-terminated, since this is a prefix */ /* We do not want to be NULL-terminated, since this is a prefix */
pfx[sizeof(pfx) - 1] = '_'; pfx[sizeof(pfx) - 1] = '_';
if (ops && ops->get_sset_count && ops->get_strings) { if (ops->get_sset_count && ops->get_strings) {
mcount = ops->get_sset_count(dev, ETH_SS_STATS); mcount = ops->get_sset_count(dev, ETH_SS_STATS);
ops->get_strings(dev, stringset, data); ops->get_strings(dev, stringset, data);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment