drivers/net/e1000/: proper prototypes
Subsystems (2)
PATCH 1/1 drivers/net/e1000/: proper prototypes
This patch moves prototypes of global variables and functions to a header file.
Signed-off-by Adrian Bunk <[email protected]>
---
drivers/net/e1000/e1000.h | 22 ++++++++++++++++++++++ drivers/net/e1000/e1000_ethtool.c | 13 ------------- drivers/net/e1000/e1000_main.c | 14 -------------- 3 files changed, 22 insertions(+), 27 deletions(-)
drivers/net/e1000/e1000.h renamed from drivers/net/e1000/e1000.h.old +22 -0
@@ -362,4 +362,26 @@boolean_t have_msi;#endif }; + + +/* e1000_main.c */ +extern char e1000_driver_name[]; +extern char e1000_driver_version[]; +int e1000_up (struct e1000_adapter *adapter); +void e1000_down (struct e1000_adapter *adapter); +void e1000_reset (struct e1000_adapter *adapter); +int e1000_setup_all_tx_resources (struct e1000_adapter *adapter); +void e1000_free_all_tx_resources (struct e1000_adapter *adapter); +int e1000_setup_all_rx_resources (struct e1000_adapter *adapter); +void e1000_free_all_rx_resources (struct e1000_adapter *adapter); +void e1000_update_stats (struct e1000_adapter *adapter); +int e1000_set_spd_dplx (struct e1000_adapter *adapter,uint16_t spddplx); + +/* e1000_ethtool.c */ +void e1000_set_ethtool_ops (struct net_device *netdev); + +/* e1000_param.c */ +void e1000_check_options (struct e1000_adapter *adapter); + +#endif /* _E1000_H_ */
drivers/net/e1000/e1000_ethtool.c renamed from drivers/net/e1000/e1000_ethtool.c.old +0 -13
@@ -32,19 +32,6 @@#include <asm/uaccess.h> -extern char e1000_driver_name[]; -extern char e1000_driver_version[]; - -extern int e1000_up (struct e1000_adapter *adapter); -extern void e1000_down (struct e1000_adapter *adapter); -extern void e1000_reset (struct e1000_adapter *adapter); -extern int e1000_set_spd_dplx (struct e1000_adapter *adapter,uint16_t spddplx); -extern int e1000_setup_all_rx_resources (struct e1000_adapter *adapter); -extern int e1000_setup_all_tx_resources (struct e1000_adapter *adapter); -extern void e1000_free_all_rx_resources (struct e1000_adapter *adapter); -extern void e1000_free_all_tx_resources (struct e1000_adapter *adapter); -extern void e1000_update_stats (struct e1000_adapter *adapter); -struct e1000_stats {char stat_string[ETH_GSTRING_LEN ];int sizeof_stat;
drivers/net/e1000/e1000_main.c renamed from drivers/net/e1000/e1000_main.c.old +0 -14
@@ -166,14 +166,6 @@MODULE_DEVICE_TABLE (pci, e1000_pci_tbl); -int e1000_up (struct e1000_adapter *adapter); -void e1000_down (struct e1000_adapter *adapter); -void e1000_reset (struct e1000_adapter *adapter); -int e1000_set_spd_dplx (struct e1000_adapter *adapter,uint16_t spddplx); -int e1000_setup_all_tx_resources (struct e1000_adapter *adapter); -int e1000_setup_all_rx_resources (struct e1000_adapter *adapter); -void e1000_free_all_tx_resources (struct e1000_adapter *adapter); -void e1000_free_all_rx_resources (struct e1000_adapter *adapter);static int e1000_setup_tx_resources (struct e1000_adapter *adapter,struct e1000_tx_ring *txdr); static int e1000_setup_rx_resources(struct e1000_adapter *adapter,
@@ -182,7 +174,6 @@ struct e1000_tx_ring *tx_ring);static void e1000_free_rx_resources (struct e1000_adapter *adapter,struct e1000_rx_ring *rx_ring); -void e1000_update_stats (struct e1000_adapter *adapter);/* Local Function Prototypes */
@@ -241,7 +232,6 @@static int e1000_ioctl (struct net_device *netdev,struct ifreq *ifr,int cmd);static int e1000_mii_ioctl (struct net_device *netdev,struct ifreq *ifr,int cmd); -void e1000_set_ethtool_ops (struct net_device *netdev);static void e1000_enter_82542_rst (struct e1000_adapter *adapter);static void e1000_leave_82542_rst (struct e1000_adapter *adapter);static void e1000_tx_timeout (struct net_device *dev);
@@ -270,10 +260,6 @@void e1000_rx_schedule (void *data);#endif -/* Exported from other modules */ - -extern void e1000_check_options (struct e1000_adapter *adapter); -static struct pci_driver e1000_driver = { .name = e1000_driver_name, .id_table = e1000_pci_tbl,
I ACK this patch.
Jeff please apply.
--
Cheers,
John