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

Commit 5b3b7608 authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

sfc: Add/remove blank lines to taste 



Remove trailing blank lines in several files.
Use only one blank line between functions.
Add a blank line as a separator in a few places.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarShradha Shah <sshah@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5eed1f68

drivers/net/ethernet/sfc/ethtool.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -699,7 +699,6 @@ static void efx_ethtool_get_pauseparam(struct net_device *net_dev, 
	pause->autoneg = !!(efx->wanted_fc & EFX_FC_AUTO);

	pause->autoneg = !!(efx->wanted_fc & EFX_FC_AUTO);

}

}







static void efx_ethtool_get_wol(struct net_device *net_dev,

static void efx_ethtool_get_wol(struct net_device *net_dev,

				struct ethtool_wolinfo *wol)

				struct ethtool_wolinfo *wol)

{

{

drivers/net/ethernet/sfc/falcon.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -422,7 +422,6 @@ static inline void falcon_irq_ack_a1(struct efx_nic *efx) 
	efx_readd(efx, &reg, FR_AA_WORK_AROUND_BROKEN_PCI_READS);

	efx_readd(efx, &reg, FR_AA_WORK_AROUND_BROKEN_PCI_READS);

}

}







static irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id)

static irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id)

{

{

	struct efx_nic *efx = dev_id;

	struct efx_nic *efx = dev_id;
@@ -467,6 +466,7 @@ static irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id) 
		efx_schedule_channel_irq(efx_get_channel(efx, 1));

		efx_schedule_channel_irq(efx_get_channel(efx, 1));

	return IRQ_HANDLED;

	return IRQ_HANDLED;

}

}



/**************************************************************************

/**************************************************************************

 *

 *

 * RSS

 * RSS
@@ -1358,6 +1358,7 @@ static void falcon_reconfigure_mac_wrapper(struct efx_nic *efx) 
	case 100:   link_speed = 1; break;

	case 100:   link_speed = 1; break;

	default:    link_speed = 0; break;

	default:    link_speed = 0; break;

	}

	}



	/* MAC_LINK_STATUS controls MAC backpressure but doesn't work

	/* MAC_LINK_STATUS controls MAC backpressure but doesn't work

	 * as advertised.  Disable to ensure packets are not

	 * as advertised.  Disable to ensure packets are not

	 * indefinitely held and TX queue can be flushed at any point

	 * indefinitely held and TX queue can be flushed at any point
@@ -2868,4 +2869,3 @@ const struct efx_nic_type falcon_b0_nic_type = { 
	.mcdi_max_ver = -1,

	.mcdi_max_ver = -1,

	.max_rx_ip_filters = FR_BZ_RX_FILTER_TBL0_ROWS,

	.max_rx_ip_filters = FR_BZ_RX_FILTER_TBL0_ROWS,

};
 
};

drivers/net/ethernet/sfc/farch.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -311,7 +311,6 @@ static inline void efx_farch_push_tx_desc(struct efx_tx_queue *tx_queue, 
 */

 */

void efx_farch_tx_write(struct efx_tx_queue *tx_queue)

void efx_farch_tx_write(struct efx_tx_queue *tx_queue)

{

{



	struct efx_tx_buffer *buffer;

	struct efx_tx_buffer *buffer;

	efx_qword_t *txd;

	efx_qword_t *txd;

	unsigned write_ptr;

	unsigned write_ptr;
@@ -1609,7 +1608,6 @@ irqreturn_t efx_farch_msi_interrupt(int irq, void *dev_id) 
	return IRQ_HANDLED;

	return IRQ_HANDLED;

}

}







/* Setup RSS indirection table.

/* Setup RSS indirection table.

 * This maps from the hash value of the packet to RXQ

 * This maps from the hash value of the packet to RXQ

 */

 */

drivers/net/ethernet/sfc/net_driver.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -1323,7 +1323,6 @@ static inline struct efx_rx_buffer *efx_rx_buffer(struct efx_rx_queue *rx_queue, 
	return &rx_queue->buffer[index];

	return &rx_queue->buffer[index];

}

}







/**

/**

 * EFX_MAX_FRAME_LEN - calculate maximum frame length

 * EFX_MAX_FRAME_LEN - calculate maximum frame length

 *

 *

drivers/net/ethernet/sfc/nic.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -530,4 +530,3 @@ void efx_nic_fix_nodesc_drop_stat(struct efx_nic *efx, u64 *rx_nodesc_drops) 
	efx->rx_nodesc_drops_prev_state = !!(efx->net_dev->flags & IFF_UP);

	efx->rx_nodesc_drops_prev_state = !!(efx->net_dev->flags & IFF_UP);

	*rx_nodesc_drops -= efx->rx_nodesc_drops_while_down;

	*rx_nodesc_drops -= efx->rx_nodesc_drops_while_down;

}
 
}