Commit c058c5f8 authored by Michal Swiatkowski's avatar Michal Swiatkowski Committed by Tony Nguyen
Browse files

idpf: remove unreachable code from setting mailbox 



Remove code that isn't reached. There is no need to check for
adapter->req_vec_chunks, because if it isn't set idpf_set_mb_vec_id()
won't be called.

Only one path when idpf_set_mb_vec_id() is called:
idpf_intr_req()
 -> idpf_send_alloc_vectors_msg() -> adapter->req_vec_chunk is allocated
 here, otherwise an error is returned and idpf_intr_req() exits with an
 error.

The idpf_set_mb_vec_id() becomes one-liner and it is called only once.
Remove it and set mailbox vector index directly.

Reviewed-by: default avatarAleksandr Loktionov <aleksandr.loktionov@intel.com>
Reviewed-by: default avatarMichal Kubiak <michal.kubiak@intel.com>
Reviewed-by: default avatarPavan Kumar Linga <pavan.kumar.linga@intel.com>
Signed-off-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Tested-by: default avatarSamuel Salin <Samuel.salin@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 508d374b

drivers/net/ethernet/intel/idpf/idpf_lib.c

+1 −17
Original line number Diff line number Diff line
@@ -143,22 +143,6 @@ static int idpf_mb_intr_req_irq(struct idpf_adapter *adapter) 
	return 0;

}



/**

 * idpf_set_mb_vec_id - Set vector index for mailbox

 * @adapter: adapter structure to access the vector chunks

 *

 * The first vector id in the requested vector chunks from the CP is for

 * the mailbox

 */

static void idpf_set_mb_vec_id(struct idpf_adapter *adapter)

{

	if (adapter->req_vec_chunks)

		adapter->mb_vector.v_idx =

			le16_to_cpu(adapter->caps.mailbox_vector_id);

	else

		adapter->mb_vector.v_idx = 0;

}



/**

 * idpf_mb_intr_init - Initialize the mailbox interrupt

 * @adapter: adapter structure to store the mailbox vector
@@ -349,7 +333,7 @@ int idpf_intr_req(struct idpf_adapter *adapter) 
		goto free_irq;

	}



	idpf_set_mb_vec_id(adapter);

	adapter->mb_vector.v_idx = le16_to_cpu(adapter->caps.mailbox_vector_id);



	vecids = kcalloc(total_vecs, sizeof(u16), GFP_KERNEL);

	if (!vecids) {