net: vmxnet3: remove multiple false checks in vmxnet3_ethtool.c

In one if branch, (ec->rx_coalesce_usecs != 0) is checked.  When it is
checked again in two more places, it is always false and has no effect
on the whole check expression.  We should remove it in both places.

In another if branch, (ec->use_adaptive_rx_coalesce != 0) is checked.
When it is checked again, it is always false.  We should remove the
entire branch with it.

In addition we might as well let C precedence dictate by getting rid of
two pairs of parentheses in the neighboring lines in order to keep
expressions on both sides of '||' in balance with checkpatch warning
silenced.

Signed-off-by: Jean Sacren <sakiwit@gmail.com>
Link: https://lore.kernel.org/r/20211031012728.8325-1-sakiwit@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
index 5dd8360b21a02cc75e88be64018e60da007ae213..16f3a2057b9067905e285bc1f067cdcd6e9669bc 100644 (file)
--- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
@@ -1134,9 +1134,8 @@ static int vmxnet3_set_coalesce(struct net_device *netdev,
        }
 
        if (ec->use_adaptive_rx_coalesce != 0) {
-               if ((ec->rx_coalesce_usecs != 0) ||
-                   (ec->tx_max_coalesced_frames != 0) ||
-                   (ec->rx_max_coalesced_frames != 0)) {
+               if (ec->tx_max_coalesced_frames != 0 ||
+                   ec->rx_max_coalesced_frames != 0) {
                        return -EINVAL;
                }
                memset(adapter->coal_conf, 0, sizeof(*adapter->coal_conf));
@@ -1146,11 +1145,6 @@ static int vmxnet3_set_coalesce(struct net_device *netdev,
 
        if ((ec->tx_max_coalesced_frames != 0) ||
            (ec->rx_max_coalesced_frames != 0)) {
-               if ((ec->rx_coalesce_usecs != 0) ||
-                   (ec->use_adaptive_rx_coalesce != 0)) {
-                       return -EINVAL;
-               }
-
                if ((ec->tx_max_coalesced_frames >
                    VMXNET3_COAL_STATIC_MAX_DEPTH) ||
                    (ec->rx_max_coalesced_frames >