openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ibmvnic: remove never executed if statement 

At the beginning of the function, from_passive_init is set false by
"adapter->from_passive_init = false;",
hence the if statement will never run.

Signed-off-by: Lijun Pan <ljp@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Lijun Pan 2020-08-19 17:52:25 -05:00 committed by David S. Miller
parent fa68bfab1e
commit 550f4d46af
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/ethernet/ibm/ibmvnic.c
View File

@ -5017,12 +5017,6 @@ static int ibmvnic_reset_init(struct ibmvnic_adapter *adapter)
return adapter->init_done_rc; return adapter->init_done_rc;
} }
if (adapter->from_passive_init) {
adapter->state = VNIC_OPEN;
adapter->from_passive_init = false;
return -1;
}
if (test_bit(0, &adapter->resetting) && !adapter->wait_for_reset && if (test_bit(0, &adapter->resetting) && !adapter->wait_for_reset &&
adapter->reset_reason != VNIC_RESET_MOBILITY) { adapter->reset_reason != VNIC_RESET_MOBILITY) {
if (adapter->req_rx_queues != old_num_rx_queues || if (adapter->req_rx_queues != old_num_rx_queues ||
@ -5076,12 +5070,6 @@ static int ibmvnic_init(struct ibmvnic_adapter *adapter)
return adapter->init_done_rc; return adapter->init_done_rc;
} }
if (adapter->from_passive_init) {
adapter->state = VNIC_OPEN;
adapter->from_passive_init = false;
return -1;
}
rc = init_sub_crqs(adapter); rc = init_sub_crqs(adapter);
if (rc) { if (rc) {
dev_err(dev, "Initialization of sub crqs failed\n"); dev_err(dev, "Initialization of sub crqs failed\n");