e1000e: cleanup ops function pointers

[~andy/linux] / drivers / net / e1000e / 82571.c

diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
index 680b7c703062ffa1b150544f5cc90c6c7934159f..6fe1b3c73c1660d8bf2d69794573f9a7ba986040 100644 (file)
--- a/drivers/net/e1000e/82571.c
+++ b/drivers/net/e1000e/82571.c
@@ -1671,64 +1671,64 @@ static struct e1000_mac_operations e82571_mac_ops = {
 };
 
 static struct e1000_phy_operations e82_phy_ops_igp = {
-       .acquire_phy            = e1000_get_hw_semaphore_82571,
+       .acquire                = e1000_get_hw_semaphore_82571,
        .check_reset_block      = e1000e_check_reset_block_generic,
-       .commit_phy             = NULL,
+       .commit                 = NULL,
        .force_speed_duplex     = e1000e_phy_force_speed_duplex_igp,
        .get_cfg_done           = e1000_get_cfg_done_82571,
        .get_cable_length       = e1000e_get_cable_length_igp_2,
-       .get_phy_info           = e1000e_get_phy_info_igp,
-       .read_phy_reg           = e1000e_read_phy_reg_igp,
-       .release_phy            = e1000_put_hw_semaphore_82571,
-       .reset_phy              = e1000e_phy_hw_reset_generic,
+       .get_info               = e1000e_get_phy_info_igp,
+       .read_reg               = e1000e_read_phy_reg_igp,
+       .release                = e1000_put_hw_semaphore_82571,
+       .reset                  = e1000e_phy_hw_reset_generic,
        .set_d0_lplu_state      = e1000_set_d0_lplu_state_82571,
        .set_d3_lplu_state      = e1000e_set_d3_lplu_state,
-       .write_phy_reg          = e1000e_write_phy_reg_igp,
+       .write_reg              = e1000e_write_phy_reg_igp,
        .cfg_on_link_up         = NULL,
 };
 
 static struct e1000_phy_operations e82_phy_ops_m88 = {
-       .acquire_phy            = e1000_get_hw_semaphore_82571,
+       .acquire                = e1000_get_hw_semaphore_82571,
        .check_reset_block      = e1000e_check_reset_block_generic,
-       .commit_phy             = e1000e_phy_sw_reset,
+       .commit                 = e1000e_phy_sw_reset,
        .force_speed_duplex     = e1000e_phy_force_speed_duplex_m88,
        .get_cfg_done           = e1000e_get_cfg_done,
        .get_cable_length       = e1000e_get_cable_length_m88,
-       .get_phy_info           = e1000e_get_phy_info_m88,
-       .read_phy_reg           = e1000e_read_phy_reg_m88,
-       .release_phy            = e1000_put_hw_semaphore_82571,
-       .reset_phy              = e1000e_phy_hw_reset_generic,
+       .get_info               = e1000e_get_phy_info_m88,
+       .read_reg               = e1000e_read_phy_reg_m88,
+       .release                = e1000_put_hw_semaphore_82571,
+       .reset                  = e1000e_phy_hw_reset_generic,
        .set_d0_lplu_state      = e1000_set_d0_lplu_state_82571,
        .set_d3_lplu_state      = e1000e_set_d3_lplu_state,
-       .write_phy_reg          = e1000e_write_phy_reg_m88,
+       .write_reg              = e1000e_write_phy_reg_m88,
        .cfg_on_link_up         = NULL,
 };
 
 static struct e1000_phy_operations e82_phy_ops_bm = {
-       .acquire_phy            = e1000_get_hw_semaphore_82571,
+       .acquire                = e1000_get_hw_semaphore_82571,
        .check_reset_block      = e1000e_check_reset_block_generic,
-       .commit_phy             = e1000e_phy_sw_reset,
+       .commit                 = e1000e_phy_sw_reset,
        .force_speed_duplex     = e1000e_phy_force_speed_duplex_m88,
        .get_cfg_done           = e1000e_get_cfg_done,
        .get_cable_length       = e1000e_get_cable_length_m88,
-       .get_phy_info           = e1000e_get_phy_info_m88,
-       .read_phy_reg           = e1000e_read_phy_reg_bm2,
-       .release_phy            = e1000_put_hw_semaphore_82571,
-       .reset_phy              = e1000e_phy_hw_reset_generic,
+       .get_info               = e1000e_get_phy_info_m88,
+       .read_reg               = e1000e_read_phy_reg_bm2,
+       .release                = e1000_put_hw_semaphore_82571,
+       .reset                  = e1000e_phy_hw_reset_generic,
        .set_d0_lplu_state      = e1000_set_d0_lplu_state_82571,
        .set_d3_lplu_state      = e1000e_set_d3_lplu_state,
-       .write_phy_reg          = e1000e_write_phy_reg_bm2,
+       .write_reg              = e1000e_write_phy_reg_bm2,
        .cfg_on_link_up         = NULL,
 };
 
 static struct e1000_nvm_operations e82571_nvm_ops = {
-       .acquire_nvm            = e1000_acquire_nvm_82571,
-       .read_nvm               = e1000e_read_nvm_eerd,
-       .release_nvm            = e1000_release_nvm_82571,
-       .update_nvm             = e1000_update_nvm_checksum_82571,
+       .acquire                = e1000_acquire_nvm_82571,
+       .read                   = e1000e_read_nvm_eerd,
+       .release                = e1000_release_nvm_82571,
+       .update                 = e1000_update_nvm_checksum_82571,
        .valid_led_default      = e1000_valid_led_default_82571,
-       .validate_nvm           = e1000_validate_nvm_checksum_82571,
-       .write_nvm              = e1000_write_nvm_82571,
+       .validate               = e1000_validate_nvm_checksum_82571,
+       .write                  = e1000_write_nvm_82571,
 };
 
 struct e1000_info e1000_82571_info = {