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

Commit eca32047 authored by Matthew Vick's avatar Matthew Vick Committed by Jeff Kirsher
Browse files

fm10k: Resolve various spelling errors and checkpatch warnings 



Fix a few silly typos in the code and checkpatch warnings in support of
general code cleanliness.

Signed-off-by: default avatarMatthew Vick <matthew.vick@intel.com>
Tested-by: default avatarKrishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 5bf33dc6

drivers/net/ethernet/intel/fm10k/fm10k_common.c

+1 −2
Original line number Diff line number Diff line
@@ -466,7 +466,6 @@ void fm10k_update_hw_stats_q(struct fm10k_hw *hw, struct fm10k_hw_stats_q *q, 
 *  Function invalidates the index values for the queues so any updates that

 *  may have happened are ignored and the base for the queue stats is reset.

 **/



void fm10k_unbind_hw_stats_q(struct fm10k_hw_stats_q *q, u32 idx, u32 count)

{

	u32 i;

drivers/net/ethernet/intel/fm10k/fm10k_iov.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ s32 fm10k_iov_update_pvid(struct fm10k_intfc *interface, u16 glort, u16 pvid) 
	if (vf_idx >= iov_data->num_vfs)

		return FM10K_ERR_PARAM;



	/* determine if an update has occured and if so notify the VF */

	/* determine if an update has occurred and if so notify the VF */

	vf_info = &iov_data->vf_info[vf_idx];

	if (vf_info->sw_vid != pvid) {

		vf_info->sw_vid = pvid;

drivers/net/ethernet/intel/fm10k/fm10k_main.c

+2 −2
Original line number Diff line number Diff line
@@ -949,10 +949,10 @@ static int __fm10k_maybe_stop_tx(struct fm10k_ring *tx_ring, u16 size) 
{

	netif_stop_subqueue(tx_ring->netdev, tx_ring->queue_index);



	/* Memory barrier before checking head and tail */

	smp_mb();



	/* We need to check again in a case another CPU has just

	 * made room available. */

	/* Check again in a case another CPU has just made room available */

	if (likely(fm10k_desc_unused(tx_ring) < size))

		return -EBUSY;

drivers/net/ethernet/intel/fm10k/fm10k_mbx.c

+10 −10
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static bool fm10k_fifo_empty(struct fm10k_mbx_fifo *fifo) 
 *  @fifo: pointer to FIFO

 *  @offset: offset to add to head

 *

 *  This function returns the indicies into the fifo based on head + offset

 *  This function returns the indices into the fifo based on head + offset

 **/

static u16 fm10k_fifo_head_offset(struct fm10k_mbx_fifo *fifo, u16 offset)

{
@@ -84,7 +84,7 @@ static u16 fm10k_fifo_head_offset(struct fm10k_mbx_fifo *fifo, u16 offset) 
 *  @fifo: pointer to FIFO

 *  @offset: offset to add to tail

 *

 *  This function returns the indicies into the fifo based on tail + offset

 *  This function returns the indices into the fifo based on tail + offset

 **/

static u16 fm10k_fifo_tail_offset(struct fm10k_mbx_fifo *fifo, u16 offset)

{
@@ -326,7 +326,7 @@ static u16 fm10k_mbx_validate_msg_size(struct fm10k_mbx_info *mbx, u16 len) 
 *  fm10k_mbx_write_copy - pulls data off of Tx FIFO and places it in mbmem

 *  @mbx: pointer to mailbox

 *

 *  This function will take a seciton of the Rx FIFO and copy it into the

 *  This function will take a section of the Rx FIFO and copy it into the

		mbx->tail--;

 *  mailbox memory.  The offset in mbmem is based on the lower bits of the

 *  tail and len determines the length to copy.
@@ -418,7 +418,7 @@ static void fm10k_mbx_pull_head(struct fm10k_hw *hw, 
 *  @hw: pointer to hardware structure

 *  @mbx: pointer to mailbox

 *

 *  This function will take a seciton of the mailbox memory and copy it

 *  This function will take a section of the mailbox memory and copy it

 *  into the Rx FIFO.  The offset is based on the lower bits of the

 *  head and len determines the length to copy.

 **/
@@ -464,7 +464,7 @@ static void fm10k_mbx_read_copy(struct fm10k_hw *hw, 
 *  @tail: tail index of message

 *

 *  This function will first validate the tail index and size for the

 *  incoming message.  It then updates the acknowlegment number and

 *  incoming message.  It then updates the acknowledgment number and

 *  copies the data into the FIFO.  It will return the number of messages

 *  dequeued on success and a negative value on error.

 **/
@@ -761,7 +761,7 @@ static s32 fm10k_mbx_enqueue_tx(struct fm10k_hw *hw, 
		err = fm10k_fifo_enqueue(&mbx->tx, msg);

	}



	/* if we failed trhead the error */

	/* if we failed treat the error */

	if (err) {

		mbx->timeout = 0;

		mbx->tx_busy++;
@@ -815,7 +815,7 @@ static void fm10k_mbx_write(struct fm10k_hw *hw, struct fm10k_mbx_info *mbx) 
{

	u32 mbmem = mbx->mbmem_reg;



	/* write new msg header to notify recepient of change */

	/* write new msg header to notify recipient of change */

	fm10k_write_reg(hw, mbmem, mbx->mbx_hdr);



	/* write mailbox to sent interrupt */
@@ -1251,7 +1251,7 @@ static s32 fm10k_mbx_process_error(struct fm10k_hw *hw, 
	/* we will need to pull all of the fields for verification */

	head = FM10K_MSG_HDR_FIELD_GET(*hdr, HEAD);



	/* we only have lower 10 bits of error number os add upper bits */

	/* we only have lower 10 bits of error number so add upper bits */

	err_no = FM10K_MSG_HDR_FIELD_GET(*hdr, ERR_NO);

	err_no |= ~FM10K_MSG_HDR_MASK(ERR_NO);
@@ -1548,7 +1548,7 @@ s32 fm10k_pfvf_mbx_init(struct fm10k_hw *hw, struct fm10k_mbx_info *mbx, 
	mbx->timeout = 0;

	mbx->udelay = FM10K_MBX_INIT_DELAY;



	/* initalize tail and head */

	/* initialize tail and head */

	mbx->tail = 1;

	mbx->head = 1;
@@ -1627,7 +1627,7 @@ static void fm10k_sm_mbx_connect_reset(struct fm10k_mbx_info *mbx) 
	mbx->local = FM10K_SM_MBX_VERSION;

	mbx->remote = 0;



	/* initalize tail and head */

	/* initialize tail and head */

	mbx->tail = 1;

	mbx->head = 1;

drivers/net/ethernet/intel/fm10k/fm10k_netdev.c

+4 −4
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ static void fm10k_free_all_rx_resources(struct fm10k_intfc *interface) 
 * fm10k_request_glort_range - Request GLORTs for use in configuring rules

 * @interface: board private structure

 *

 * This function allocates a range of glorts for this inteface to use.

 * This function allocates a range of glorts for this interface to use.

 **/

static void fm10k_request_glort_range(struct fm10k_intfc *interface)

{
@@ -781,7 +781,7 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set) 


	fm10k_mbx_lock(interface);



	/* only need to update the VLAN if not in promiscous mode */

	/* only need to update the VLAN if not in promiscuous mode */

	if (!(netdev->flags & IFF_PROMISC)) {

		err = hw->mac.ops.update_vlan(hw, vid, 0, set);

		if (err)
@@ -970,7 +970,7 @@ static void fm10k_set_rx_mode(struct net_device *dev) 


	fm10k_mbx_lock(interface);



	/* syncronize all of the addresses */

	/* synchronize all of the addresses */

	if (xcast_mode != FM10K_XCAST_MODE_PROMISC) {

		__dev_uc_sync(dev, fm10k_uc_sync, fm10k_uc_unsync);

		if (xcast_mode != FM10K_XCAST_MODE_ALLMULTI)
@@ -1051,7 +1051,7 @@ void fm10k_restore_rx_state(struct fm10k_intfc *interface) 
					   vid, true, 0);

	}



	/* syncronize all of the addresses */

	/* synchronize all of the addresses */

	if (xcast_mode != FM10K_XCAST_MODE_PROMISC) {

		__dev_uc_sync(netdev, fm10k_uc_sync, fm10k_uc_unsync);

		if (xcast_mode != FM10K_XCAST_MODE_ALLMULTI)