Commit 6881b07f authored by Michal Suchanek's avatar Michal Suchanek Committed by David S. Miller
Browse files

ibmvnic: Fix possibly uninitialized old_num_tx_queues variable warning. 



GCC 7.5 reports:
../drivers/net/ethernet/ibm/ibmvnic.c: In function 'ibmvnic_reset_init':
../drivers/net/ethernet/ibm/ibmvnic.c:5373:51: warning: 'old_num_tx_queues' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/net/ethernet/ibm/ibmvnic.c:5373:6: warning: 'old_num_rx_queues' may be used uninitialized in this function [-Wmaybe-uninitialized]

The variable is initialized only if(reset) and used only if(reset &&
something) so this is a false positive. However, there is no reason to
not initialize the variables unconditionally avoiding the warning.

Fixes: 635e442f ("ibmvnic: merge ibmvnic_reset_init and ibmvnic_init")
Signed-off-by: default avatarMichal Suchanek <msuchanek@suse.de>
Reviewed-by: default avatarSukadev Bhattiprolu <sukadev@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2378b2c9

drivers/net/ethernet/ibm/ibmvnic.c

+3 −5
Original line number Diff line number Diff line
@@ -5219,16 +5219,14 @@ static int ibmvnic_reset_init(struct ibmvnic_adapter *adapter, bool reset) 
{

	struct device *dev = &adapter->vdev->dev;

	unsigned long timeout = msecs_to_jiffies(20000);

	u64 old_num_rx_queues, old_num_tx_queues;

	u64 old_num_rx_queues = adapter->req_rx_queues;

	u64 old_num_tx_queues = adapter->req_tx_queues;

	int rc;



	adapter->from_passive_init = false;



	if (reset) {

		old_num_rx_queues = adapter->req_rx_queues;

		old_num_tx_queues = adapter->req_tx_queues;

	if (reset)

		reinit_completion(&adapter->init_done);

	}



	adapter->init_done_rc = 0;

	rc = ibmvnic_send_crq_init(adapter);