net: ena: fix coding style nits

This commit fixes two nits, but it does not generate any change to binary
because of the optimization of gcc.

  - use `count` instead of `channels->combined_count`
  - change return type from `int` to `bool`

Also add spaces and change macro order in OR assignment to make the code
easier to read.

Signed-off-by: Sameeh Jubran <sameehj@amazon.com>
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.co.jp>
Signed-off-by: Shay Agroskin <shayagr@amazon.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/amazon/ena/ena_eth_com.c b/drivers/net/ethernet/amazon/ena/ena_eth_com.c
index 85daeac219ec808f50e47dac8001b1340ac515aa..c3be751e7379f76d2ba2de53c1816995a17b9b2c 100644 (file)
--- a/drivers/net/ethernet/amazon/ena/ena_eth_com.c
+++ b/drivers/net/ethernet/amazon/ena/ena_eth_com.c
@@ -578,6 +578,7 @@ int ena_com_rx_pkt(struct ena_com_io_cq *io_cq,
        ena_com_rx_set_flags(io_cq, ena_rx_ctx, cdesc);
 
        ena_rx_ctx->descs = nb_hw_desc;
+
        return 0;
 }
 
@@ -602,8 +603,8 @@ int ena_com_add_single_rx_desc(struct ena_com_io_sq *io_sq,
 
        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;
+                    ENA_ETH_IO_RX_DESC_COMP_REQ_MASK |
+                    (io_sq->phase & ENA_ETH_IO_RX_DESC_PHASE_MASK);
 
        desc->req_id = req_id;
 

diff --git a/drivers/net/ethernet/amazon/ena/ena_ethtool.c b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
index 6cdd9efe8df3463bad6c3e761dfeb42cef0954f1..2ad44ae74cf61a74a4e2eac0504cb336249e3352 100644 (file)
--- a/drivers/net/ethernet/amazon/ena/ena_ethtool.c
+++ b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
@@ -839,7 +839,7 @@ static int ena_set_channels(struct net_device *netdev,
        /* The check for max value is already done in ethtool */
        if (count < ENA_MIN_NUM_IO_QUEUES ||
            (ena_xdp_present(adapter) &&
-           !ena_xdp_legal_queue_count(adapter, channels->combined_count)))
+           !ena_xdp_legal_queue_count(adapter, count)))
                return -EINVAL;
 
        return ena_update_queue_count(adapter, count);

diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.h b/drivers/net/ethernet/amazon/ena/ena_netdev.h
index 30eb686749dcdd9c8893c44464fdbaf0acbfb466..c39f41711c31d43b8653488a22e70e69f474ac29 100644 (file)
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.h
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.h
@@ -433,8 +433,8 @@ static inline bool ena_xdp_present_ring(struct ena_ring *ring)
        return !!ring->xdp_bpf_prog;
 }
 
-static inline int ena_xdp_legal_queue_count(struct ena_adapter *adapter,
-                                           u32 queues)
+static inline bool ena_xdp_legal_queue_count(struct ena_adapter *adapter,
+                                            u32 queues)
 {
        return 2 * queues <= adapter->max_num_io_queues;
 }