OSDN Git Service

net: ena: cosmetic: remove unnecessary code
authorArthur Kiyanovski <akiyano@amazon.com>
Fri, 22 May 2020 09:09:01 +0000 (12:09 +0300)
committerDavid S. Miller <davem@davemloft.net>
Fri, 22 May 2020 21:12:48 +0000 (14:12 -0700)
1. Remove unused definition of DRV_MODULE_VERSION
2. Remove {} from single line-of-code ifs
3. Remove unnecessary comments from ena_get/set_coalesce()
4. Remove unnecessary extra spaces and newlines

Signed-off-by: Arthur Kiyanovski <akiyano@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/amazon/ena/ena_ethtool.c
drivers/net/ethernet/amazon/ena/ena_netdev.h

index ca13efa..e340b65 100644 (file)
@@ -206,7 +206,7 @@ int ena_get_sset_count(struct net_device *netdev, int sset)
        if (sset != ETH_SS_STATS)
                return -EOPNOTSUPP;
 
-       return  adapter->num_io_queues * (ENA_STATS_ARRAY_TX + ENA_STATS_ARRAY_RX)
+       return adapter->num_io_queues * (ENA_STATS_ARRAY_TX + ENA_STATS_ARRAY_RX)
                + ENA_STATS_ARRAY_GLOBAL + ENA_STATS_ARRAY_ENA_COM;
 }
 
@@ -260,7 +260,6 @@ static void ena_get_strings(struct net_device *netdev, u32 sset, u8 *data)
 
        for (i = 0; i < ENA_STATS_ARRAY_GLOBAL; i++) {
                ena_stats = &ena_stats_global_strings[i];
-
                memcpy(data, ena_stats->name, ETH_GSTRING_LEN);
                data += ETH_GSTRING_LEN;
        }
@@ -307,10 +306,8 @@ static int ena_get_coalesce(struct net_device *net_dev,
        struct ena_adapter *adapter = netdev_priv(net_dev);
        struct ena_com_dev *ena_dev = adapter->ena_dev;
 
-       if (!ena_com_interrupt_moderation_supported(ena_dev)) {
-               /* the devie doesn't support interrupt moderation */
+       if (!ena_com_interrupt_moderation_supported(ena_dev))
                return -EOPNOTSUPP;
-       }
 
        coalesce->tx_coalesce_usecs =
                ena_com_get_nonadaptive_moderation_interval_tx(ena_dev) *
@@ -355,10 +352,8 @@ static int ena_set_coalesce(struct net_device *net_dev,
        struct ena_com_dev *ena_dev = adapter->ena_dev;
        int rc;
 
-       if (!ena_com_interrupt_moderation_supported(ena_dev)) {
-               /* the devie doesn't support interrupt moderation */
+       if (!ena_com_interrupt_moderation_supported(ena_dev))
                return -EOPNOTSUPP;
-       }
 
        rc = ena_com_update_nonadaptive_moderation_interval_tx(ena_dev,
                                                               coalesce->tx_coalesce_usecs);
index 680099a..5320b91 100644 (file)
 #define DRV_MODULE_GEN_SUBMINOR 0
 
 #define DRV_MODULE_NAME                "ena"
-#ifndef DRV_MODULE_GENERATION
-#define DRV_MODULE_GENERATION \
-       __stringify(DRV_MODULE_GEN_MAJOR) "."   \
-       __stringify(DRV_MODULE_GEN_MINOR) "."   \
-       __stringify(DRV_MODULE_GEN_SUBMINOR) "K"
-#endif
 
 #define DEVICE_NAME    "Elastic Network Adapter (ENA)"