80 lines
3.3 KiB
Diff
80 lines
3.3 KiB
Diff
From: Arthur Kiyanovski <akiyano@amazon.com>
|
|
Date: Thu, 11 Oct 2018 11:26:25 +0300
|
|
Subject: [PATCH 11/19] net: ena: remove redundant parameter in
|
|
ena_com_admin_init()
|
|
Origin: f1e90f6e2c1fb0e491f910540314015324fed1e2
|
|
|
|
Remove redundant spinlock acquire parameter from ena_com_admin_init()
|
|
|
|
Signed-off-by: Arthur Kiyanovski <akiyano@amazon.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/amazon/ena/ena_com.c | 6 ++----
|
|
drivers/net/ethernet/amazon/ena/ena_com.h | 5 +----
|
|
drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +-
|
|
3 files changed, 4 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/amazon/ena/ena_com.c b/drivers/net/ethernet/amazon/ena/ena_com.c
|
|
index 5c468b28723b..420cede41ca4 100644
|
|
--- a/drivers/net/ethernet/amazon/ena/ena_com.c
|
|
+++ b/drivers/net/ethernet/amazon/ena/ena_com.c
|
|
@@ -1701,8 +1701,7 @@ void ena_com_mmio_reg_read_request_write_dev_addr(struct ena_com_dev *ena_dev)
|
|
}
|
|
|
|
int ena_com_admin_init(struct ena_com_dev *ena_dev,
|
|
- struct ena_aenq_handlers *aenq_handlers,
|
|
- bool init_spinlock)
|
|
+ struct ena_aenq_handlers *aenq_handlers)
|
|
{
|
|
struct ena_com_admin_queue *admin_queue = &ena_dev->admin_queue;
|
|
u32 aq_caps, acq_caps, dev_sts, addr_low, addr_high;
|
|
@@ -1728,8 +1727,7 @@ int ena_com_admin_init(struct ena_com_dev *ena_dev,
|
|
|
|
atomic_set(&admin_queue->outstanding_cmds, 0);
|
|
|
|
- if (init_spinlock)
|
|
- spin_lock_init(&admin_queue->q_lock);
|
|
+ spin_lock_init(&admin_queue->q_lock);
|
|
|
|
ret = ena_com_init_comp_ctxt(admin_queue);
|
|
if (ret)
|
|
diff --git a/drivers/net/ethernet/amazon/ena/ena_com.h b/drivers/net/ethernet/amazon/ena/ena_com.h
|
|
index 25af8d025919..ae8b4857fce3 100644
|
|
--- a/drivers/net/ethernet/amazon/ena/ena_com.h
|
|
+++ b/drivers/net/ethernet/amazon/ena/ena_com.h
|
|
@@ -436,8 +436,6 @@ void ena_com_mmio_reg_read_request_destroy(struct ena_com_dev *ena_dev);
|
|
/* ena_com_admin_init - Init the admin and the async queues
|
|
* @ena_dev: ENA communication layer struct
|
|
* @aenq_handlers: Those handlers to be called upon event.
|
|
- * @init_spinlock: Indicate if this method should init the admin spinlock or
|
|
- * the spinlock was init before (for example, in a case of FLR).
|
|
*
|
|
* Initialize the admin submission and completion queues.
|
|
* Initialize the asynchronous events notification queues.
|
|
@@ -445,8 +443,7 @@ void ena_com_mmio_reg_read_request_destroy(struct ena_com_dev *ena_dev);
|
|
* @return - 0 on success, negative value on failure.
|
|
*/
|
|
int ena_com_admin_init(struct ena_com_dev *ena_dev,
|
|
- struct ena_aenq_handlers *aenq_handlers,
|
|
- bool init_spinlock);
|
|
+ struct ena_aenq_handlers *aenq_handlers);
|
|
|
|
/* ena_com_admin_destroy - Destroy the admin and the async events queues.
|
|
* @ena_dev: ENA communication layer struct
|
|
diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
|
|
index c4c33b174e17..284a0a612131 100644
|
|
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
|
|
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
|
|
@@ -2508,7 +2508,7 @@ static int ena_device_init(struct ena_com_dev *ena_dev, struct pci_dev *pdev,
|
|
}
|
|
|
|
/* ENA admin level init */
|
|
- rc = ena_com_admin_init(ena_dev, &aenq_handlers, true);
|
|
+ rc = ena_com_admin_init(ena_dev, &aenq_handlers);
|
|
if (rc) {
|
|
dev_err(dev,
|
|
"Can not initialize ena admin queue with device\n");
|
|
--
|
|
2.19.2
|
|
|