[V1,net-next,14/15] net: ena: cosmetic: minor code changes

Message ID	1590088114-381-15-git-send-email-akiyano@amazon.com
State	New
Headers	show Return-Path: <SRS0=hUHR=7D=vger.kernel.org=netdev-owner@kernel.org> IronPort-SDR: YsTfqtII4tC7jmoLyU5X8sZHfEoQH/SvcfQGtGNvyS7cGvexwP8iK877//Qv+lG/2sOFTxtVMW xcX5uC/9+kBQ== From: <akiyano@amazon.com> To: <davem@davemloft.net>, <netdev@vger.kernel.org> CC: Arthur Kiyanovski <akiyano@amazon.com>, <dwmw@amazon.com>, <zorik@amazon.com>, <matua@amazon.com>, <saeedb@amazon.com>, <msw@amazon.com>, <aliguori@amazon.com>, <nafea@amazon.com>, <gtzalik@amazon.com>, <netanel@amazon.com>, <alisaidi@amazon.com>, <benh@amazon.com>, <ndagan@amazon.com>, <shayagr@amazon.com>, <sameehj@amazon.com> Subject: [PATCH V1 net-next 14/15] net: ena: cosmetic: minor code changes Date: Thu, 21 May 2020 22:08:33 +0300 Message-ID: <1590088114-381-15-git-send-email-akiyano@amazon.com> In-Reply-To: <1590088114-381-1-git-send-email-akiyano@amazon.com> References: <1590088114-381-1-git-send-email-akiyano@amazon.com> MIME-Version: 1.0 Content-Type: text/plain Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	ENA features and cosmetic changes \| expand [V1,net-next,00/15] ENA features and cosmetic changes [V1,net-next,01/15] net: ena: add support for the rx offset feature [V1,net-next,06/15] net: ena: simplify ena_com_update_intr_delay_resolution() [V1,net-next,07/15] net: ena: cosmetic: rename ena_update_tx/rx_rings_intr_moderation() [V1,net-next,09/15] net: ena: cosmetic: fix spelling and grammar mistakes in comments [V1,net-next,10/15] net: ena: cosmetic: fix line break issues [V1,net-next,12/15] net: ena: cosmetic: code reorderings [V1,net-next,14/15] net: ena: cosmetic: minor code changes [V1,net-next,15/15] net: ena: reduce driver load time

Message ID

1590088114-381-15-git-send-email-akiyano@amazon.com

State

New

Headers

IronPort-SDR: YsTfqtII4tC7jmoLyU5X8sZHfEoQH/SvcfQGtGNvyS7cGvexwP8iK877//Qv+lG/2sOFTxtVMW
	xcX5uC/9+kBQ==
From: <akiyano@amazon.com>
To: <davem@davemloft.net>, <netdev@vger.kernel.org>
CC: Arthur Kiyanovski <akiyano@amazon.com>, <dwmw@amazon.com>,
	<zorik@amazon.com>, <matua@amazon.com>, <saeedb@amazon.com>,
	<msw@amazon.com>, <aliguori@amazon.com>, <nafea@amazon.com>,
	<gtzalik@amazon.com>, <netanel@amazon.com>, <alisaidi@amazon.com>,
	<benh@amazon.com>, <ndagan@amazon.com>, <shayagr@amazon.com>,
	<sameehj@amazon.com>
Subject: [PATCH V1 net-next 14/15] net: ena: cosmetic: minor code changes
Date: Thu, 21 May 2020 22:08:33 +0300
Message-ID: <1590088114-381-15-git-send-email-akiyano@amazon.com>
In-Reply-To: <1590088114-381-1-git-send-email-akiyano@amazon.com>
References: <1590088114-381-1-git-send-email-akiyano@amazon.com>
MIME-Version: 1.0
Content-Type: text/plain
Sender: netdev-owner@vger.kernel.org
Precedence: bulk

Series

ENA features and cosmetic changes | expand

Commit Message

Kiyanovski, Arthur May 21, 2020, 7:08 p.m. UTC

From: Arthur Kiyanovski <akiyano@amazon.com>

1. Use BIT macro instead of shift operator for code clarity
2. Replace multiple flag assignments to a single assignment of multiple
   flags in ena_com_add_single_rx_desc()
3. Move ENA_HASH_KEY_SIZE from ena_netdev.h to ena_com.h

Signed-off-by: Arthur Kiyanovski <akiyano@amazon.com>
---
 drivers/net/ethernet/amazon/ena/ena_com.c     | 2 +-
 drivers/net/ethernet/amazon/ena/ena_com.h     | 2 ++
 drivers/net/ethernet/amazon/ena/ena_eth_com.c | 8 ++++----
 drivers/net/ethernet/amazon/ena/ena_netdev.h  | 2 --
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/amazon/ena/ena_com.c b/drivers/net/ethernet/amazon/ena/ena_com.c
index bf3465e5a2e7..4b1dbedbe921 100644
--- a/drivers/net/ethernet/amazon/ena/ena_com.c
+++ b/drivers/net/ethernet/amazon/ena/ena_com.c
@@ -2285,7 +2285,7 @@  int ena_com_fill_hash_function(struct ena_com_dev *ena_dev,
 	if (unlikely(rc))
 		return rc;
 
-	if (!((1 << func) & get_resp.u.flow_hash_func.supported_func)) {
+	if (!(BIT(func) & get_resp.u.flow_hash_func.supported_func)) {
 		pr_err("Flow hash function %d isn't supported\n", func);
 		return -EOPNOTSUPP;
 	}
diff --git a/drivers/net/ethernet/amazon/ena/ena_com.h b/drivers/net/ethernet/amazon/ena/ena_com.h
index bd65ae205f8d..325c9a5f677b 100644
--- a/drivers/net/ethernet/amazon/ena/ena_com.h
+++ b/drivers/net/ethernet/amazon/ena/ena_com.h
@@ -77,6 +77,8 @@ 
 #define ENA_INTR_INITIAL_RX_INTERVAL_USECS 0
 #define ENA_DEFAULT_INTR_DELAY_RESOLUTION 1
 
+#define ENA_HASH_KEY_SIZE 40
+
 #define ENA_HW_HINTS_NO_TIMEOUT	0xFFFF
 
 #define ENA_FEATURE_MAX_QUEUE_EXT_VER 1
diff --git a/drivers/net/ethernet/amazon/ena/ena_eth_com.c b/drivers/net/ethernet/amazon/ena/ena_eth_com.c
index f0b90e1551a3..cb6bce101c3b 100644
--- a/drivers/net/ethernet/amazon/ena/ena_eth_com.c
+++ b/drivers/net/ethernet/amazon/ena/ena_eth_com.c
@@ -598,10 +598,10 @@  int ena_com_add_single_rx_desc(struct ena_com_io_sq *io_sq,
 
 	desc->length = ena_buf->len;
 
-	desc->ctrl = ENA_ETH_IO_RX_DESC_FIRST_MASK;
-	desc->ctrl |= ENA_ETH_IO_RX_DESC_LAST_MASK;
-	desc->ctrl |= io_sq->phase & ENA_ETH_IO_RX_DESC_PHASE_MASK;
-	desc->ctrl |= ENA_ETH_IO_RX_DESC_COMP_REQ_MASK;
+	desc->ctrl = ENA_ETH_IO_RX_DESC_FIRST_MASK |
+		ENA_ETH_IO_RX_DESC_LAST_MASK |
+		(io_sq->phase & ENA_ETH_IO_RX_DESC_PHASE_MASK) |
+		ENA_ETH_IO_RX_DESC_COMP_REQ_MASK;
 
 	desc->req_id = req_id;
 
diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.h b/drivers/net/ethernet/amazon/ena/ena_netdev.h
index 5320b916a36b..9b3948c7e8a0 100644
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.h
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.h
@@ -98,8 +98,6 @@ 
 #define ENA_RX_RSS_TABLE_LOG_SIZE  7
 #define ENA_RX_RSS_TABLE_SIZE	(1 << ENA_RX_RSS_TABLE_LOG_SIZE)
 
-#define ENA_HASH_KEY_SIZE	40
-
 /* The number of tx packet completions that will be handled each NAPI poll
  * cycle is ring_size / ENA_TX_POLL_BUDGET_DIVIDER.
  */

[V1,net-next,14/15] net: ena: cosmetic: minor code changes

Commit Message

Patch