aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/atl1e
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/atl1e')
-rw-r--r--drivers/net/atl1e/atl1e_ethtool.c2
-rw-r--r--drivers/net/atl1e/atl1e_main.c7
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/atl1e/atl1e_ethtool.c b/drivers/net/atl1e/atl1e_ethtool.c
index ffd696ee7c8e..6943a6c3b948 100644
--- a/drivers/net/atl1e/atl1e_ethtool.c
+++ b/drivers/net/atl1e/atl1e_ethtool.c
@@ -338,8 +338,6 @@ static void atl1e_get_wol(struct net_device *netdev,
338 wol->wolopts |= WAKE_MAGIC; 338 wol->wolopts |= WAKE_MAGIC;
339 if (adapter->wol & AT_WUFC_LNKC) 339 if (adapter->wol & AT_WUFC_LNKC)
340 wol->wolopts |= WAKE_PHY; 340 wol->wolopts |= WAKE_PHY;
341
342 return;
343} 341}
344 342
345static int atl1e_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 343static int atl1e_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index 7dd33776de00..1acea5774e89 100644
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -707,8 +707,6 @@ static void atl1e_init_ring_resources(struct atl1e_adapter *adapter)
707 adapter->ring_vir_addr = NULL; 707 adapter->ring_vir_addr = NULL;
708 adapter->rx_ring.desc = NULL; 708 adapter->rx_ring.desc = NULL;
709 rwlock_init(&adapter->tx_ring.tx_lock); 709 rwlock_init(&adapter->tx_ring.tx_lock);
710
711 return;
712} 710}
713 711
714/* 712/*
@@ -905,8 +903,6 @@ static inline void atl1e_configure_des_ring(const struct atl1e_adapter *adapter)
905 AT_WRITE_REG(hw, REG_HOST_RXFPAGE_SIZE, rx_ring->page_size); 903 AT_WRITE_REG(hw, REG_HOST_RXFPAGE_SIZE, rx_ring->page_size);
906 /* Load all of base address above */ 904 /* Load all of base address above */
907 AT_WRITE_REG(hw, REG_LOAD_PTR, 1); 905 AT_WRITE_REG(hw, REG_LOAD_PTR, 1);
908
909 return;
910} 906}
911 907
912static inline void atl1e_configure_tx(struct atl1e_adapter *adapter) 908static inline void atl1e_configure_tx(struct atl1e_adapter *adapter)
@@ -950,7 +946,6 @@ static inline void atl1e_configure_tx(struct atl1e_adapter *adapter)
950 (((u16)hw->tpd_burst & TXQ_CTRL_NUM_TPD_BURST_MASK) 946 (((u16)hw->tpd_burst & TXQ_CTRL_NUM_TPD_BURST_MASK)
951 << TXQ_CTRL_NUM_TPD_BURST_SHIFT) 947 << TXQ_CTRL_NUM_TPD_BURST_SHIFT)
952 | TXQ_CTRL_ENH_MODE | TXQ_CTRL_EN); 948 | TXQ_CTRL_ENH_MODE | TXQ_CTRL_EN);
953 return;
954} 949}
955 950
956static inline void atl1e_configure_rx(struct atl1e_adapter *adapter) 951static inline void atl1e_configure_rx(struct atl1e_adapter *adapter)
@@ -1004,7 +999,6 @@ static inline void atl1e_configure_rx(struct atl1e_adapter *adapter)
1004 RXQ_CTRL_CUT_THRU_EN | RXQ_CTRL_EN; 999 RXQ_CTRL_CUT_THRU_EN | RXQ_CTRL_EN;
1005 1000
1006 AT_WRITE_REG(hw, REG_RXQ_CTRL, rxq_ctrl_data); 1001 AT_WRITE_REG(hw, REG_RXQ_CTRL, rxq_ctrl_data);
1007 return;
1008} 1002}
1009 1003
1010static inline void atl1e_configure_dma(struct atl1e_adapter *adapter) 1004static inline void atl1e_configure_dma(struct atl1e_adapter *adapter)
@@ -1024,7 +1018,6 @@ static inline void atl1e_configure_dma(struct atl1e_adapter *adapter)
1024 << DMA_CTRL_DMAW_DLY_CNT_SHIFT; 1018 << DMA_CTRL_DMAW_DLY_CNT_SHIFT;
1025 1019
1026 AT_WRITE_REG(hw, REG_DMA_CTRL, dma_ctrl_data); 1020 AT_WRITE_REG(hw, REG_DMA_CTRL, dma_ctrl_data);
1027 return;
1028} 1021}
1029 1022
1030static void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter) 1023static void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter)