aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2014-02-12 14:00:37 -0500
committerDavid S. Miller <davem@davemloft.net>2014-02-12 17:53:35 -0500
commit5b3b76085c68b33da6903f216ebc16903b199ac4 (patch)
tree26018a6963c3604953a677b55050012d16616d19
parent5eed1f68523c8cdeeafae24350200d47ddc293b7 (diff)
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: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: Shradha Shah <sshah@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/sfc/ethtool.c1
-rw-r--r--drivers/net/ethernet/sfc/falcon.c4
-rw-r--r--drivers/net/ethernet/sfc/farch.c2
-rw-r--r--drivers/net/ethernet/sfc/net_driver.h1
-rw-r--r--drivers/net/ethernet/sfc/nic.c1
5 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/ethernet/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c
index 7d5cb86a47ef..89fcaffd7de2 100644
--- a/drivers/net/ethernet/sfc/ethtool.c
+++ b/drivers/net/ethernet/sfc/ethtool.c
@@ -699,7 +699,6 @@ static void efx_ethtool_get_pauseparam(struct net_device *net_dev,
699 pause->autoneg = !!(efx->wanted_fc & EFX_FC_AUTO); 699 pause->autoneg = !!(efx->wanted_fc & EFX_FC_AUTO);
700} 700}
701 701
702
703static void efx_ethtool_get_wol(struct net_device *net_dev, 702static void efx_ethtool_get_wol(struct net_device *net_dev,
704 struct ethtool_wolinfo *wol) 703 struct ethtool_wolinfo *wol)
705{ 704{
diff --git a/drivers/net/ethernet/sfc/falcon.c b/drivers/net/ethernet/sfc/falcon.c
index 18d6f761f4d0..72652f380243 100644
--- a/drivers/net/ethernet/sfc/falcon.c
+++ b/drivers/net/ethernet/sfc/falcon.c
@@ -422,7 +422,6 @@ static inline void falcon_irq_ack_a1(struct efx_nic *efx)
422 efx_readd(efx, &reg, FR_AA_WORK_AROUND_BROKEN_PCI_READS); 422 efx_readd(efx, &reg, FR_AA_WORK_AROUND_BROKEN_PCI_READS);
423} 423}
424 424
425
426static irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id) 425static irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id)
427{ 426{
428 struct efx_nic *efx = dev_id; 427 struct efx_nic *efx = dev_id;
@@ -467,6 +466,7 @@ static irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id)
467 efx_schedule_channel_irq(efx_get_channel(efx, 1)); 466 efx_schedule_channel_irq(efx_get_channel(efx, 1));
468 return IRQ_HANDLED; 467 return IRQ_HANDLED;
469} 468}
469
470/************************************************************************** 470/**************************************************************************
471 * 471 *
472 * RSS 472 * RSS
@@ -1358,6 +1358,7 @@ static void falcon_reconfigure_mac_wrapper(struct efx_nic *efx)
1358 case 100: link_speed = 1; break; 1358 case 100: link_speed = 1; break;
1359 default: link_speed = 0; break; 1359 default: link_speed = 0; break;
1360 } 1360 }
1361
1361 /* MAC_LINK_STATUS controls MAC backpressure but doesn't work 1362 /* MAC_LINK_STATUS controls MAC backpressure but doesn't work
1362 * as advertised. Disable to ensure packets are not 1363 * as advertised. Disable to ensure packets are not
1363 * indefinitely held and TX queue can be flushed at any point 1364 * indefinitely held and TX queue can be flushed at any point
@@ -2868,4 +2869,3 @@ const struct efx_nic_type falcon_b0_nic_type = {
2868 .mcdi_max_ver = -1, 2869 .mcdi_max_ver = -1,
2869 .max_rx_ip_filters = FR_BZ_RX_FILTER_TBL0_ROWS, 2870 .max_rx_ip_filters = FR_BZ_RX_FILTER_TBL0_ROWS,
2870}; 2871};
2871
diff --git a/drivers/net/ethernet/sfc/farch.c b/drivers/net/ethernet/sfc/farch.c
index f72489a105ca..aa1b169f45ec 100644
--- a/drivers/net/ethernet/sfc/farch.c
+++ b/drivers/net/ethernet/sfc/farch.c
@@ -311,7 +311,6 @@ static inline void efx_farch_push_tx_desc(struct efx_tx_queue *tx_queue,
311 */ 311 */
312void efx_farch_tx_write(struct efx_tx_queue *tx_queue) 312void efx_farch_tx_write(struct efx_tx_queue *tx_queue)
313{ 313{
314
315 struct efx_tx_buffer *buffer; 314 struct efx_tx_buffer *buffer;
316 efx_qword_t *txd; 315 efx_qword_t *txd;
317 unsigned write_ptr; 316 unsigned write_ptr;
@@ -1609,7 +1608,6 @@ irqreturn_t efx_farch_msi_interrupt(int irq, void *dev_id)
1609 return IRQ_HANDLED; 1608 return IRQ_HANDLED;
1610} 1609}
1611 1610
1612
1613/* Setup RSS indirection table. 1611/* Setup RSS indirection table.
1614 * This maps from the hash value of the packet to RXQ 1612 * This maps from the hash value of the packet to RXQ
1615 */ 1613 */
diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
index af2b8c59a903..8a400a0595eb 100644
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -1323,7 +1323,6 @@ static inline struct efx_rx_buffer *efx_rx_buffer(struct efx_rx_queue *rx_queue,
1323 return &rx_queue->buffer[index]; 1323 return &rx_queue->buffer[index];
1324} 1324}
1325 1325
1326
1327/** 1326/**
1328 * EFX_MAX_FRAME_LEN - calculate maximum frame length 1327 * EFX_MAX_FRAME_LEN - calculate maximum frame length
1329 * 1328 *
diff --git a/drivers/net/ethernet/sfc/nic.c b/drivers/net/ethernet/sfc/nic.c
index 79226b19e3c4..32d969e857f7 100644
--- a/drivers/net/ethernet/sfc/nic.c
+++ b/drivers/net/ethernet/sfc/nic.c
@@ -530,4 +530,3 @@ void efx_nic_fix_nodesc_drop_stat(struct efx_nic *efx, u64 *rx_nodesc_drops)
530 efx->rx_nodesc_drops_prev_state = !!(efx->net_dev->flags & IFF_UP); 530 efx->rx_nodesc_drops_prev_state = !!(efx->net_dev->flags & IFF_UP);
531 *rx_nodesc_drops -= efx->rx_nodesc_drops_while_down; 531 *rx_nodesc_drops -= efx->rx_nodesc_drops_while_down;
532} 532}
533