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: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dsa/master.c b/net/dsa/master.c
index 90e6df0351eb218a6621151960ca2109c3698580..9ec16b39ed1582fce0b5a3788f6156314fa5ac53 100644 (file)
--- a/net/dsa/master.c
+++ b/net/dsa/master.c
@@ -22,7 +22,7 @@ static void dsa_master_get_ethtool_stats(struct net_device *dev,
        int port = cpu_dp->index;
        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);
                ops->get_ethtool_stats(dev, stats, data);
        }
@@ -38,7 +38,7 @@ static int dsa_master_get_sset_count(struct net_device *dev, int sset)
        struct dsa_switch *ds = cpu_dp->ds;
        int count = 0;
 
-       if (ops && ops->get_sset_count)
+       if (ops->get_sset_count)
                count += ops->get_sset_count(dev, sset);
 
        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,
        /* We do not want to be NULL-terminated, since this is a prefix */
        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);
                ops->get_strings(dev, stringset, data);
        }