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

Commit 5ccc921a authored by Joe Perches's avatar Joe Perches
Browse files

intel: Remove extern from function prototypes 



There are a mix of function prototypes with and without extern
in the kernel sources.  Standardize on not using extern for
function prototypes.

Function prototypes don't need to be written with extern.
extern is assumed by the compiler.  Its use is as unnecessary as
using auto to declare automatic/local variables in a block.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
parent d4cb2ee1

drivers/net/ethernet/intel/e1000/e1000.h

+16 −16
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ enum e1000_state_t { 
#undef pr_fmt

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



extern struct net_device *e1000_get_hw_dev(struct e1000_hw *hw);

struct net_device *e1000_get_hw_dev(struct e1000_hw *hw);

#define e_dbg(format, arg...) \

	netdev_dbg(e1000_get_hw_dev(hw), format, ## arg)

#define e_err(msglvl, format, arg...) \
@@ -346,20 +346,20 @@ extern struct net_device *e1000_get_hw_dev(struct e1000_hw *hw); 
extern char e1000_driver_name[];

extern const char e1000_driver_version[];



extern int e1000_up(struct e1000_adapter *adapter);

extern void e1000_down(struct e1000_adapter *adapter);

extern void e1000_reinit_locked(struct e1000_adapter *adapter);

extern void e1000_reset(struct e1000_adapter *adapter);

extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, u32 spd, u8 dplx);

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);

extern bool e1000_has_link(struct e1000_adapter *adapter);

extern void e1000_power_up_phy(struct e1000_adapter *);

extern void e1000_set_ethtool_ops(struct net_device *netdev);

extern void e1000_check_options(struct e1000_adapter *adapter);

extern char *e1000_get_hw_dev_name(struct e1000_hw *hw);

int e1000_up(struct e1000_adapter *adapter);

void e1000_down(struct e1000_adapter *adapter);

void e1000_reinit_locked(struct e1000_adapter *adapter);

void e1000_reset(struct e1000_adapter *adapter);

int e1000_set_spd_dplx(struct e1000_adapter *adapter, u32 spd, u8 dplx);

int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);

int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);

void e1000_free_all_rx_resources(struct e1000_adapter *adapter);

void e1000_free_all_tx_resources(struct e1000_adapter *adapter);

void e1000_update_stats(struct e1000_adapter *adapter);

bool e1000_has_link(struct e1000_adapter *adapter);

void e1000_power_up_phy(struct e1000_adapter *);

void e1000_set_ethtool_ops(struct net_device *netdev);

void e1000_check_options(struct e1000_adapter *adapter);

char *e1000_get_hw_dev_name(struct e1000_hw *hw);



#endif /* _E1000_H_ */

drivers/net/ethernet/intel/e1000e/e1000.h

+22 −23
Original line number Diff line number Diff line
@@ -472,26 +472,25 @@ enum latency_range { 
extern char e1000e_driver_name[];

extern const char e1000e_driver_version[];



extern void e1000e_check_options(struct e1000_adapter *adapter);

extern void e1000e_set_ethtool_ops(struct net_device *netdev);



extern int e1000e_up(struct e1000_adapter *adapter);

extern void e1000e_down(struct e1000_adapter *adapter);

extern void e1000e_reinit_locked(struct e1000_adapter *adapter);

extern void e1000e_reset(struct e1000_adapter *adapter);

extern void e1000e_power_up_phy(struct e1000_adapter *adapter);

extern int e1000e_setup_rx_resources(struct e1000_ring *ring);

extern int e1000e_setup_tx_resources(struct e1000_ring *ring);

extern void e1000e_free_rx_resources(struct e1000_ring *ring);

extern void e1000e_free_tx_resources(struct e1000_ring *ring);

extern struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev,

						    struct rtnl_link_stats64

						    *stats);

extern void e1000e_set_interrupt_capability(struct e1000_adapter *adapter);

extern void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter);

extern void e1000e_get_hw_control(struct e1000_adapter *adapter);

extern void e1000e_release_hw_control(struct e1000_adapter *adapter);

extern void e1000e_write_itr(struct e1000_adapter *adapter, u32 itr);

void e1000e_check_options(struct e1000_adapter *adapter);

void e1000e_set_ethtool_ops(struct net_device *netdev);



int e1000e_up(struct e1000_adapter *adapter);

void e1000e_down(struct e1000_adapter *adapter);

void e1000e_reinit_locked(struct e1000_adapter *adapter);

void e1000e_reset(struct e1000_adapter *adapter);

void e1000e_power_up_phy(struct e1000_adapter *adapter);

int e1000e_setup_rx_resources(struct e1000_ring *ring);

int e1000e_setup_tx_resources(struct e1000_ring *ring);

void e1000e_free_rx_resources(struct e1000_ring *ring);

void e1000e_free_tx_resources(struct e1000_ring *ring);

struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev,

					     struct rtnl_link_stats64 *stats);

void e1000e_set_interrupt_capability(struct e1000_adapter *adapter);

void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter);

void e1000e_get_hw_control(struct e1000_adapter *adapter);

void e1000e_release_hw_control(struct e1000_adapter *adapter);

void e1000e_write_itr(struct e1000_adapter *adapter, u32 itr);



extern unsigned int copybreak;
@@ -508,8 +507,8 @@ extern const struct e1000_info e1000_pch2_info; 
extern const struct e1000_info e1000_pch_lpt_info;

extern const struct e1000_info e1000_es2_info;



extern void e1000e_ptp_init(struct e1000_adapter *adapter);

extern void e1000e_ptp_remove(struct e1000_adapter *adapter);

void e1000e_ptp_init(struct e1000_adapter *adapter);

void e1000e_ptp_remove(struct e1000_adapter *adapter);



static inline s32 e1000_phy_hw_reset(struct e1000_hw *hw)

{
@@ -536,7 +535,7 @@ static inline s32 e1e_wphy_locked(struct e1000_hw *hw, u32 offset, u16 data) 
	return hw->phy.ops.write_reg_locked(hw, offset, data);

}



extern void e1000e_reload_nvm_generic(struct e1000_hw *hw);

void e1000e_reload_nvm_generic(struct e1000_hw *hw);



static inline s32 e1000e_read_mac_addr(struct e1000_hw *hw)

{

drivers/net/ethernet/intel/igb/e1000_82575.h

+8 −8
Original line number Diff line number Diff line
@@ -28,14 +28,14 @@ 
#ifndef _E1000_82575_H_

#define _E1000_82575_H_



extern void igb_shutdown_serdes_link_82575(struct e1000_hw *hw);

extern void igb_power_up_serdes_link_82575(struct e1000_hw *hw);

extern void igb_power_down_phy_copper_82575(struct e1000_hw *hw);

extern void igb_rx_fifo_flush_82575(struct e1000_hw *hw);

extern s32 igb_read_i2c_byte(struct e1000_hw *hw, u8 byte_offset,

				u8 dev_addr, u8 *data);

extern s32 igb_write_i2c_byte(struct e1000_hw *hw, u8 byte_offset,

				 u8 dev_addr, u8 data);

void igb_shutdown_serdes_link_82575(struct e1000_hw *hw);

void igb_power_up_serdes_link_82575(struct e1000_hw *hw);

void igb_power_down_phy_copper_82575(struct e1000_hw *hw);

void igb_rx_fifo_flush_82575(struct e1000_hw *hw);

s32 igb_read_i2c_byte(struct e1000_hw *hw, u8 byte_offset, u8 dev_addr,

		      u8 *data);

s32 igb_write_i2c_byte(struct e1000_hw *hw, u8 byte_offset, u8 dev_addr,

		       u8 data);



#define ID_LED_DEFAULT_82575_SERDES ((ID_LED_DEF1_DEF2 << 12) | \

                                     (ID_LED_DEF1_DEF2 <<  8) | \

drivers/net/ethernet/intel/igb/e1000_hw.h

+3 −3
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ struct e1000_hw { 
	u8  revision_id;

};



extern struct net_device *igb_get_hw_dev(struct e1000_hw *hw);

struct net_device *igb_get_hw_dev(struct e1000_hw *hw);

#define hw_dbg(format, arg...) \

	netdev_dbg(igb_get_hw_dev(hw), format, ##arg)

drivers/net/ethernet/intel/igb/e1000_i210.h

+18 −20
Original line number Diff line number Diff line
@@ -28,26 +28,24 @@ 
#ifndef _E1000_I210_H_

#define _E1000_I210_H_



extern s32 igb_update_flash_i210(struct e1000_hw *hw);

extern s32 igb_update_nvm_checksum_i210(struct e1000_hw *hw);

extern s32 igb_validate_nvm_checksum_i210(struct e1000_hw *hw);

extern s32 igb_write_nvm_srwr_i210(struct e1000_hw *hw, u16 offset,

			      u16 words, u16 *data);

extern s32 igb_read_nvm_srrd_i210(struct e1000_hw *hw, u16 offset,

			     u16 words, u16 *data);

extern s32 igb_acquire_swfw_sync_i210(struct e1000_hw *hw, u16 mask);

extern void igb_release_swfw_sync_i210(struct e1000_hw *hw, u16 mask);

extern s32 igb_acquire_nvm_i210(struct e1000_hw *hw);

extern void igb_release_nvm_i210(struct e1000_hw *hw);

extern s32 igb_valid_led_default_i210(struct e1000_hw *hw, u16 *data);

extern s32 igb_read_invm_version(struct e1000_hw *hw,

				 struct e1000_fw_version *invm_ver);

extern s32 igb_read_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr,

s32 igb_update_flash_i210(struct e1000_hw *hw);

s32 igb_update_nvm_checksum_i210(struct e1000_hw *hw);

s32 igb_validate_nvm_checksum_i210(struct e1000_hw *hw);

s32 igb_write_nvm_srwr_i210(struct e1000_hw *hw, u16 offset, u16 words,

			    u16 *data);

s32 igb_read_nvm_srrd_i210(struct e1000_hw *hw, u16 offset, u16 words,

			   u16 *data);

extern s32 igb_write_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr,

			       u16 data);

extern s32 igb_init_nvm_params_i210(struct e1000_hw *hw);

extern bool igb_get_flash_presence_i210(struct e1000_hw *hw);

s32 igb_acquire_swfw_sync_i210(struct e1000_hw *hw, u16 mask);

void igb_release_swfw_sync_i210(struct e1000_hw *hw, u16 mask);

s32 igb_acquire_nvm_i210(struct e1000_hw *hw);

void igb_release_nvm_i210(struct e1000_hw *hw);

s32 igb_valid_led_default_i210(struct e1000_hw *hw, u16 *data);

s32 igb_read_invm_version(struct e1000_hw *hw,

			  struct e1000_fw_version *invm_ver);

s32 igb_read_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr, u16 *data);

s32 igb_write_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr, u16 data);

s32 igb_init_nvm_params_i210(struct e1000_hw *hw);

bool igb_get_flash_presence_i210(struct e1000_hw *hw);



#define E1000_STM_OPCODE		0xDB00

#define E1000_EEPROM_FLASH_SIZE_WORD	0x11