p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ixgbe: cleanup sparse errors in new ixgbe_x550.c file 

This patch cleans up prototypes that should have been defined
as static.

Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Don Skidmore 2014-12-06 05:59:21 +00:00 committed by Jeff Kirsher
parent f4a80f1ef7
commit 7ddbde3f74
1 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
View File

@ -80,7 +80,7 @@ static s32 ixgbe_write_phy_reg_x550em(struct ixgbe_hw *hw, u32 reg_addr,
* Initializes the EEPROM parameters ixgbe_eeprom_info within the * Initializes the EEPROM parameters ixgbe_eeprom_info within the
* ixgbe_hw struct in order to set up EEPROM access. * ixgbe_hw struct in order to set up EEPROM access.
**/ **/
s32 ixgbe_init_eeprom_params_X550(struct ixgbe_hw *hw) static s32 ixgbe_init_eeprom_params_X550(struct ixgbe_hw *hw)
{ {
struct ixgbe_eeprom_info *eeprom = &hw->eeprom; struct ixgbe_eeprom_info *eeprom = &hw->eeprom;
u32 eec; u32 eec;
@ -110,8 +110,8 @@ s32 ixgbe_init_eeprom_params_X550(struct ixgbe_hw *hw)
* @device_type: 3 bit device type * @device_type: 3 bit device type
* @phy_data: Pointer to read data from the register * @phy_data: Pointer to read data from the register
**/ **/
s32 ixgbe_read_iosf_sb_reg_x550(struct ixgbe_hw *hw, u32 reg_addr, static s32 ixgbe_read_iosf_sb_reg_x550(struct ixgbe_hw *hw, u32 reg_addr,
u32 device_type, u32 *data) u32 device_type, u32 *data)
{ {
u32 i, command, error; u32 i, command, error;
@ -158,7 +158,8 @@ s32 ixgbe_read_iosf_sb_reg_x550(struct ixgbe_hw *hw, u32 reg_addr,
* *
* Reads a 16 bit word from the EEPROM using the hostif. * Reads a 16 bit word from the EEPROM using the hostif.
**/ **/
s32 ixgbe_read_ee_hostif_data_X550(struct ixgbe_hw *hw, u16 offset, u16 *data) static s32 ixgbe_read_ee_hostif_data_X550(struct ixgbe_hw *hw, u16 offset,
u16 *data)
{ {
s32 status; s32 status;
struct ixgbe_hic_read_shadow_ram buffer; struct ixgbe_hic_read_shadow_ram buffer;
@ -193,8 +194,8 @@ s32 ixgbe_read_ee_hostif_data_X550(struct ixgbe_hw *hw, u16 offset, u16 *data)
* *
* Reads a 16 bit word(s) from the EEPROM using the hostif. * Reads a 16 bit word(s) from the EEPROM using the hostif.
**/ **/
s32 ixgbe_read_ee_hostif_buffer_X550(struct ixgbe_hw *hw, static s32 ixgbe_read_ee_hostif_buffer_X550(struct ixgbe_hw *hw,
u16 offset, u16 words, u16 *data) u16 offset, u16 words, u16 *data)
{ {
struct ixgbe_hic_read_shadow_ram buffer; struct ixgbe_hic_read_shadow_ram buffer;
u32 current_word = 0; u32 current_word = 0;
@ -331,7 +332,8 @@ static s32 ixgbe_checksum_ptr_x550(struct ixgbe_hw *hw, u16 ptr,
* *
* Returns a negative error code on error, or the 16-bit checksum * Returns a negative error code on error, or the 16-bit checksum
**/ **/
s32 ixgbe_calc_checksum_X550(struct ixgbe_hw *hw, u16 *buffer, u32 buffer_size) static s32 ixgbe_calc_checksum_X550(struct ixgbe_hw *hw, u16 *buffer,
u32 buffer_size)
{ {
u16 eeprom_ptrs[IXGBE_EEPROM_LAST_WORD + 1]; u16 eeprom_ptrs[IXGBE_EEPROM_LAST_WORD + 1];
u16 *local_buffer; u16 *local_buffer;
@ -407,7 +409,7 @@ s32 ixgbe_calc_checksum_X550(struct ixgbe_hw *hw, u16 *buffer, u32 buffer_size)
* *
* Returns a negative error code on error, or the 16-bit checksum * Returns a negative error code on error, or the 16-bit checksum
**/ **/
s32 ixgbe_calc_eeprom_checksum_X550(struct ixgbe_hw *hw) static s32 ixgbe_calc_eeprom_checksum_X550(struct ixgbe_hw *hw)
{ {
return ixgbe_calc_checksum_X550(hw, NULL, 0); return ixgbe_calc_checksum_X550(hw, NULL, 0);
} }
@ -419,7 +421,7 @@ s32 ixgbe_calc_eeprom_checksum_X550(struct ixgbe_hw *hw)
* *
* Reads a 16 bit word from the EEPROM using the hostif. * Reads a 16 bit word from the EEPROM using the hostif.
**/ **/
s32 ixgbe_read_ee_hostif_X550(struct ixgbe_hw *hw, u16 offset, u16 *data) static s32 ixgbe_read_ee_hostif_X550(struct ixgbe_hw *hw, u16 offset, u16 *data)
{ {
s32 status = 0; s32 status = 0;
@ -440,7 +442,8 @@ s32 ixgbe_read_ee_hostif_X550(struct ixgbe_hw *hw, u16 offset, u16 *data)
* Performs checksum calculation and validates the EEPROM checksum. If the * Performs checksum calculation and validates the EEPROM checksum. If the
* caller does not need checksum_val, the value can be NULL. * caller does not need checksum_val, the value can be NULL.
**/ **/
s32 ixgbe_validate_eeprom_checksum_X550(struct ixgbe_hw *hw, u16 *checksum_val) static s32 ixgbe_validate_eeprom_checksum_X550(struct ixgbe_hw *hw,
u16 *checksum_val)
{ {
s32 status; s32 status;
u16 checksum; u16 checksum;
@ -489,7 +492,8 @@ s32 ixgbe_validate_eeprom_checksum_X550(struct ixgbe_hw *hw, u16 *checksum_val)
* *
* Write a 16 bit word to the EEPROM using the hostif. * Write a 16 bit word to the EEPROM using the hostif.
**/ **/
s32 ixgbe_write_ee_hostif_data_X550(struct ixgbe_hw *hw, u16 offset, u16 data) static s32 ixgbe_write_ee_hostif_data_X550(struct ixgbe_hw *hw, u16 offset,
u16 data)
{ {
s32 status; s32 status;
struct ixgbe_hic_write_shadow_ram buffer; struct ixgbe_hic_write_shadow_ram buffer;
@ -517,7 +521,7 @@ s32 ixgbe_write_ee_hostif_data_X550(struct ixgbe_hw *hw, u16 offset, u16 data)
* *
* Write a 16 bit word to the EEPROM using the hostif. * Write a 16 bit word to the EEPROM using the hostif.
**/ **/
s32 ixgbe_write_ee_hostif_X550(struct ixgbe_hw *hw, u16 offset, u16 data) static s32 ixgbe_write_ee_hostif_X550(struct ixgbe_hw *hw, u16 offset, u16 data)
{ {
s32 status = 0; s32 status = 0;
@ -537,7 +541,7 @@ s32 ixgbe_write_ee_hostif_X550(struct ixgbe_hw *hw, u16 offset, u16 data)
* *
* Issue a shadow RAM dump to FW to copy EEPROM from shadow RAM to the flash. * Issue a shadow RAM dump to FW to copy EEPROM from shadow RAM to the flash.
**/ **/
s32 ixgbe_update_flash_X550(struct ixgbe_hw *hw) static s32 ixgbe_update_flash_X550(struct ixgbe_hw *hw)
{ {
s32 status = 0; s32 status = 0;
union ixgbe_hic_hdr2 buffer; union ixgbe_hic_hdr2 buffer;
@ -560,7 +564,7 @@ s32 ixgbe_update_flash_X550(struct ixgbe_hw *hw)
* checksum and updates the EEPROM and instructs the hardware to update * checksum and updates the EEPROM and instructs the hardware to update
* the flash. * the flash.
**/ **/
s32 ixgbe_update_eeprom_checksum_X550(struct ixgbe_hw *hw) static s32 ixgbe_update_eeprom_checksum_X550(struct ixgbe_hw *hw)
{ {
s32 status; s32 status;
u16 checksum = 0; u16 checksum = 0;
@ -600,8 +604,9 @@ s32 ixgbe_update_eeprom_checksum_X550(struct ixgbe_hw *hw)
* *
* Write a 16 bit word(s) to the EEPROM using the hostif. * Write a 16 bit word(s) to the EEPROM using the hostif.
**/ **/
s32 ixgbe_write_ee_hostif_buffer_X550(struct ixgbe_hw *hw, static s32 ixgbe_write_ee_hostif_buffer_X550(struct ixgbe_hw *hw,
u16 offset, u16 words, u16 *data) u16 offset, u16 words,
u16 *data)
{ {
s32 status = 0; s32 status = 0;
u32 i = 0; u32 i = 0;
@ -630,7 +635,7 @@ s32 ixgbe_write_ee_hostif_buffer_X550(struct ixgbe_hw *hw,
/** ixgbe_init_mac_link_ops_X550em - init mac link function pointers /** ixgbe_init_mac_link_ops_X550em - init mac link function pointers
* @hw: pointer to hardware structure * @hw: pointer to hardware structure
**/ **/
void ixgbe_init_mac_link_ops_X550em(struct ixgbe_hw *hw) static void ixgbe_init_mac_link_ops_X550em(struct ixgbe_hw *hw)
{ {
struct ixgbe_mac_info *mac = &hw->mac; struct ixgbe_mac_info *mac = &hw->mac;
@ -647,7 +652,7 @@ void ixgbe_init_mac_link_ops_X550em(struct ixgbe_hw *hw)
/** ixgbe_setup_sfp_modules_X550em - Setup SFP module /** ixgbe_setup_sfp_modules_X550em - Setup SFP module
* @hw: pointer to hardware structure * @hw: pointer to hardware structure
*/ */
s32 ixgbe_setup_sfp_modules_X550em(struct ixgbe_hw *hw) static s32 ixgbe_setup_sfp_modules_X550em(struct ixgbe_hw *hw)
{ {
bool setup_linear; bool setup_linear;
u16 reg_slice, edc_mode; u16 reg_slice, edc_mode;
@ -703,9 +708,9 @@ s32 ixgbe_setup_sfp_modules_X550em(struct ixgbe_hw *hw)
* @speed: pointer to link speed * @speed: pointer to link speed
* @autoneg: true when autoneg or autotry is enabled * @autoneg: true when autoneg or autotry is enabled
**/ **/
s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw, static s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,
ixgbe_link_speed *speed, ixgbe_link_speed *speed,
bool *autoneg) bool *autoneg)
{ {
/* SFP */ /* SFP */
if (hw->phy.media_type == ixgbe_media_type_fiber) { if (hw->phy.media_type == ixgbe_media_type_fiber) {
@ -740,8 +745,8 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,
* @device_type: 3 bit device type * @device_type: 3 bit device type
* @data: Data to write to the register * @data: Data to write to the register
**/ **/
s32 ixgbe_write_iosf_sb_reg_x550(struct ixgbe_hw *hw, u32 reg_addr, static s32 ixgbe_write_iosf_sb_reg_x550(struct ixgbe_hw *hw, u32 reg_addr,
u32 device_type, u32 data) u32 device_type, u32 data)
{ {
u32 i, command, error; u32 i, command, error;
@ -904,7 +909,7 @@ static s32 ixgbe_setup_ixfi_x550em(struct ixgbe_hw *hw, ixgbe_link_speed *speed)
* *
* Configures the integrated KX4 PHY. * Configures the integrated KX4 PHY.
**/ **/
s32 ixgbe_setup_kx4_x550em(struct ixgbe_hw *hw) static s32 ixgbe_setup_kx4_x550em(struct ixgbe_hw *hw)
{ {
s32 status; s32 status;
u32 reg_val; u32 reg_val;
@ -942,7 +947,7 @@ s32 ixgbe_setup_kx4_x550em(struct ixgbe_hw *hw)
* *
* Configures the integrated KR PHY. * Configures the integrated KR PHY.
**/ **/
s32 ixgbe_setup_kr_x550em(struct ixgbe_hw *hw) static s32 ixgbe_setup_kr_x550em(struct ixgbe_hw *hw)
{ {
s32 status; s32 status;
u32 reg_val; u32 reg_val;
@ -987,7 +992,7 @@ s32 ixgbe_setup_kr_x550em(struct ixgbe_hw *hw)
* A return of a non-zero value indicates an error, and the base driver should * A return of a non-zero value indicates an error, and the base driver should
* not report link up. * not report link up.
**/ **/
s32 ixgbe_setup_internal_phy_x550em(struct ixgbe_hw *hw) static s32 ixgbe_setup_internal_phy_x550em(struct ixgbe_hw *hw)
{ {
u32 status; u32 status;
u16 lasi, autoneg_status, speed; u16 lasi, autoneg_status, speed;
@ -1049,7 +1054,7 @@ s32 ixgbe_setup_internal_phy_x550em(struct ixgbe_hw *hw)
* set during init_shared_code because the PHY/SFP type was * set during init_shared_code because the PHY/SFP type was
* not known. Perform the SFP init if necessary. * not known. Perform the SFP init if necessary.
**/ **/
s32 ixgbe_init_phy_ops_X550em(struct ixgbe_hw *hw) static s32 ixgbe_init_phy_ops_X550em(struct ixgbe_hw *hw)
{ {
struct ixgbe_phy_info *phy = &hw->phy; struct ixgbe_phy_info *phy = &hw->phy;
s32 ret_val; s32 ret_val;
@ -1102,7 +1107,7 @@ s32 ixgbe_init_phy_ops_X550em(struct ixgbe_hw *hw)
* Returns the media type (fiber, copper, backplane) * Returns the media type (fiber, copper, backplane)
* *
*/ */
enum ixgbe_media_type ixgbe_get_media_type_X550em(struct ixgbe_hw *hw) static enum ixgbe_media_type ixgbe_get_media_type_X550em(struct ixgbe_hw *hw)
{ {
enum ixgbe_media_type media_type; enum ixgbe_media_type media_type;
@ -1129,7 +1134,7 @@ enum ixgbe_media_type ixgbe_get_media_type_X550em(struct ixgbe_hw *hw)
/** ixgbe_init_ext_t_x550em - Start (unstall) the external Base T PHY. /** ixgbe_init_ext_t_x550em - Start (unstall) the external Base T PHY.
** @hw: pointer to hardware structure ** @hw: pointer to hardware structure
**/ **/
s32 ixgbe_init_ext_t_x550em(struct ixgbe_hw *hw) static s32 ixgbe_init_ext_t_x550em(struct ixgbe_hw *hw)
{ {
u32 status; u32 status;
u16 reg; u16 reg;
@ -1202,7 +1207,7 @@ s32 ixgbe_init_ext_t_x550em(struct ixgbe_hw *hw)
** and clears all interrupts, perform a PHY reset, and perform a link (MAC) ** and clears all interrupts, perform a PHY reset, and perform a link (MAC)
** reset. ** reset.
**/ **/
s32 ixgbe_reset_hw_X550em(struct ixgbe_hw *hw) static s32 ixgbe_reset_hw_X550em(struct ixgbe_hw *hw)
{ {
ixgbe_link_speed link_speed; ixgbe_link_speed link_speed;
s32 status; s32 status;