Commit fdca471f authored by Arthur Kiyanovski's avatar Arthur Kiyanovski Committed by Khalid Elmously

net: ena: remove redundant parameter in ena_com_admin_init()

BugLink: http://bugs.launchpad.net/bugs/1798182

Remove redundant spinlock acquire parameter from ena_com_admin_init()
Signed-off-by: default avatarArthur Kiyanovski <akiyano@amazon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
(cherry picked from commit f1e90f6e linux-next)
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
Acked-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Acked-by: default avatarSeth Forshee <seth.forshee@canonical.com>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
parent 773b1240
...@@ -1701,8 +1701,7 @@ void ena_com_mmio_reg_read_request_write_dev_addr(struct ena_com_dev *ena_dev) ...@@ -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, int ena_com_admin_init(struct ena_com_dev *ena_dev,
struct ena_aenq_handlers *aenq_handlers, struct ena_aenq_handlers *aenq_handlers)
bool init_spinlock)
{ {
struct ena_com_admin_queue *admin_queue = &ena_dev->admin_queue; struct ena_com_admin_queue *admin_queue = &ena_dev->admin_queue;
u32 aq_caps, acq_caps, dev_sts, addr_low, addr_high; 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, ...@@ -1728,8 +1727,7 @@ int ena_com_admin_init(struct ena_com_dev *ena_dev,
atomic_set(&admin_queue->outstanding_cmds, 0); 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); ret = ena_com_init_comp_ctxt(admin_queue);
if (ret) if (ret)
......
...@@ -436,8 +436,6 @@ void ena_com_mmio_reg_read_request_destroy(struct ena_com_dev *ena_dev); ...@@ -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_com_admin_init - Init the admin and the async queues
* @ena_dev: ENA communication layer struct * @ena_dev: ENA communication layer struct
* @aenq_handlers: Those handlers to be called upon event. * @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 admin submission and completion queues.
* Initialize the asynchronous events notification 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); ...@@ -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. * @return - 0 on success, negative value on failure.
*/ */
int ena_com_admin_init(struct ena_com_dev *ena_dev, int ena_com_admin_init(struct ena_com_dev *ena_dev,
struct ena_aenq_handlers *aenq_handlers, struct ena_aenq_handlers *aenq_handlers);
bool init_spinlock);
/* ena_com_admin_destroy - Destroy the admin and the async events queues. /* ena_com_admin_destroy - Destroy the admin and the async events queues.
* @ena_dev: ENA communication layer struct * @ena_dev: ENA communication layer struct
......
...@@ -2496,7 +2496,7 @@ static int ena_device_init(struct ena_com_dev *ena_dev, struct pci_dev *pdev, ...@@ -2496,7 +2496,7 @@ static int ena_device_init(struct ena_com_dev *ena_dev, struct pci_dev *pdev,
} }
/* ENA admin level init */ /* 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) { if (rc) {
dev_err(dev, dev_err(dev,
"Can not initialize ena admin queue with device\n"); "Can not initialize ena admin queue with device\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment