OSDN Git Service

net: ena: Change return value of ena_calc_io_queue_size() to void
authorArthur Kiyanovski <akiyano@amazon.com>
Fri, 7 Jan 2022 20:23:37 +0000 (20:23 +0000)
committerJakub Kicinski <kuba@kernel.org>
Sat, 8 Jan 2022 03:25:50 +0000 (19:25 -0800)
ena_calc_io_queue_size() always returns 0, therefore make it a
void function and update the calling function to stop checking
the return value.

Signed-off-by: Shay Agroskin <shayagr@amazon.com>
Signed-off-by: Arthur Kiyanovski <akiyano@amazon.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/amazon/ena/ena_netdev.c

index 05cadc4..7877098 100644 (file)
@@ -4146,7 +4146,7 @@ static void ena_release_bars(struct ena_com_dev *ena_dev, struct pci_dev *pdev)
 }
 
 
-static int ena_calc_io_queue_size(struct ena_calc_queue_size_ctx *ctx)
+static void ena_calc_io_queue_size(struct ena_calc_queue_size_ctx *ctx)
 {
        struct ena_admin_feature_llq_desc *llq = &ctx->get_feat_ctx->llq;
        struct ena_com_dev *ena_dev = ctx->ena_dev;
@@ -4208,8 +4208,6 @@ static int ena_calc_io_queue_size(struct ena_calc_queue_size_ctx *ctx)
        ctx->max_rx_queue_size = max_rx_queue_size;
        ctx->tx_queue_size = tx_queue_size;
        ctx->rx_queue_size = rx_queue_size;
-
-       return 0;
 }
 
 /* ena_probe - Device Initialization Routine
@@ -4320,8 +4318,8 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        ena_dev->intr_moder_rx_interval = ENA_INTR_INITIAL_RX_INTERVAL_USECS;
        ena_dev->intr_delay_resolution = ENA_DEFAULT_INTR_DELAY_RESOLUTION;
        max_num_io_queues = ena_calc_max_io_queue_num(pdev, ena_dev, &get_feat_ctx);
-       rc = ena_calc_io_queue_size(&calc_queue_ctx);
-       if (rc || !max_num_io_queues) {
+       ena_calc_io_queue_size(&calc_queue_ctx);
+       if (unlikely(!max_num_io_queues)) {
                rc = -EFAULT;
                goto err_device_destroy;
        }