net: ena: cosmetic: code reorderings

1. Reorder sanity checks in get_comp_ctxt() to make more sense
2. Reorder variables in ena_com_fill_hash_function() and
   ena_calc_io_queue_size() in reverse christmas tree.
3. Move around member initializations.

Signed-off-by: Arthur Kiyanovski <akiyano@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/amazon/ena/ena_com.c b/drivers/net/ethernet/amazon/ena/ena_com.c
index a513d71..bf3465e 100644 (file)
--- a/drivers/net/ethernet/amazon/ena/ena_com.c
+++ b/drivers/net/ethernet/amazon/ena/ena_com.c
@@ -200,17 +200,17 @@ static void comp_ctxt_release(struct ena_com_admin_queue *queue,
 static struct ena_comp_ctx *get_comp_ctxt(struct ena_com_admin_queue *queue,
                                          u16 command_id, bool capture)
 {
-       if (unlikely(!queue->comp_ctx)) {
-               pr_err("Completion context is NULL\n");
-               return NULL;
-       }
-
        if (unlikely(command_id >= queue->q_depth)) {
                pr_err("command id is larger than the queue size. cmd_id: %u queue size %d\n",
                       command_id, queue->q_depth);
                return NULL;
        }
 
+       if (unlikely(!queue->comp_ctx)) {
+               pr_err("Completion context is NULL\n");
+               return NULL;
+       }
+
        if (unlikely(queue->comp_ctx[command_id].occupied && capture)) {
                pr_err("Completion context is occupied\n");
                return NULL;
@@ -2266,13 +2266,14 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena_dev,
                               enum ena_admin_hash_functions func,
                               const u8 *key, u16 key_len, u32 init_val)
 {
-       struct ena_rss *rss = &ena_dev->rss;
+       struct ena_admin_feature_rss_flow_hash_control *hash_key;
        struct ena_admin_get_feat_resp get_resp;
-       struct ena_admin_feature_rss_flow_hash_control *hash_key =
-               rss->hash_key;
        enum ena_admin_hash_functions old_func;
+       struct ena_rss *rss = &ena_dev->rss;
        int rc;
 
+       hash_key = rss->hash_key;
+
        /* Make sure size is a mult of DWs */
        if (unlikely(key_len & 0x3))
                return -EINVAL;

diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index 148d13c..313e65b 100644 (file)
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -4121,8 +4121,8 @@ static int ena_calc_io_queue_size(struct ena_calc_queue_size_ctx *ctx)
  */
 static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-       struct ena_com_dev_get_features_ctx get_feat_ctx;
        struct ena_calc_queue_size_ctx calc_queue_ctx = { 0 };
+       struct ena_com_dev_get_features_ctx get_feat_ctx;
        struct ena_llq_configurations llq_config;
        struct ena_com_dev *ena_dev = NULL;
        struct ena_adapter *adapter;
@@ -4233,12 +4233,11 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        adapter->num_io_queues = max_num_io_queues;
        adapter->max_num_io_queues = max_num_io_queues;
+       adapter->last_monitored_tx_qid = 0;
 
        adapter->xdp_first_ring = 0;
        adapter->xdp_num_queues = 0;
 
-       adapter->last_monitored_tx_qid = 0;
-
        adapter->rx_copybreak = ENA_DEFAULT_RX_COPYBREAK;
        adapter->wd_state = wd_state;