Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da614d04 authored by Emil Tantilov's avatar Emil Tantilov Committed by Jeff Kirsher
Browse files

ixgbe: return early instead of wrap block in if statement 



Since we exit at the end of the block, we can save a level of
indentation by performing an early return, and make the next several
sections of code more legible, with fewer 80 character line breaks.

Also moved allocating vfinfo at the beginning and the notification
for enabling SRIOV at the end of the function when we know that it
will succeed.

Signed-off-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 2bc09729

drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c

+41 −44
Original line number Diff line number Diff line
@@ -74,9 +74,9 @@ static inline void ixgbe_alloc_vf_macvlans(struct ixgbe_adapter *adapter) 
static int __ixgbe_enable_sriov(struct ixgbe_adapter *adapter)

{

	struct ixgbe_hw *hw = &adapter->hw;

	int i;



	adapter->flags |= IXGBE_FLAG_SRIOV_ENABLED;

	e_info(probe, "SR-IOV enabled with %d VFs\n", adapter->num_vfs);



	/* Enable VMDq flag so device will be set in VM mode */

	adapter->flags |= IXGBE_FLAG_VMDQ_ENABLED;
@@ -84,20 +84,19 @@ static int __ixgbe_enable_sriov(struct ixgbe_adapter *adapter) 
		adapter->ring_feature[RING_F_VMDQ].limit = 1;

	adapter->ring_feature[RING_F_VMDQ].offset = adapter->num_vfs;



	/* Initialize default switching mode VEB */

	IXGBE_WRITE_REG(hw, IXGBE_PFDTXGSWC, IXGBE_PFDTXGSWC_VT_LBEN);

	adapter->bridge_mode = BRIDGE_MODE_VEB;



	ixgbe_alloc_vf_macvlans(adapter);



	/* If call to enable VFs succeeded then allocate memory

	 * for per VF control structures.

	 */

	adapter->vfinfo =

		kcalloc(adapter->num_vfs,

	adapter->vfinfo = kcalloc(adapter->num_vfs,

				  sizeof(struct vf_data_storage), GFP_KERNEL);

	if (adapter->vfinfo) {

		int i;

	if (!adapter->vfinfo)

		return -ENOMEM;



	ixgbe_alloc_vf_macvlans(adapter);



	/* Initialize default switching mode VEB */

	IXGBE_WRITE_REG(hw, IXGBE_PFDTXGSWC, IXGBE_PFDTXGSWC_VT_LBEN);

	adapter->bridge_mode = BRIDGE_MODE_VEB;



	/* limit trafffic classes based on VFs enabled */

	if ((adapter->hw.mac.type == ixgbe_mac_82599EB) &&
@@ -134,12 +133,10 @@ static int __ixgbe_enable_sriov(struct ixgbe_adapter *adapter) 
		adapter->vfinfo[i].xcast_mode = IXGBEVF_XCAST_MODE_NONE;

	}



	e_info(probe, "SR-IOV enabled with %d VFs\n", adapter->num_vfs);

	return 0;

}



	return -ENOMEM;

}



/**

 * ixgbe_get_vfs - Find and take references to all vf devices

 * @adapter: Pointer to adapter struct