]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
fm10k: address operator not needed when declaring function pointers
authorBruce Allan <bruce.w.allan@intel.com>
Tue, 8 Dec 2015 23:50:34 +0000 (15:50 -0800)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 22 Dec 2015 13:06:29 +0000 (05:06 -0800)
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/fm10k/fm10k_pf.c
drivers/net/ethernet/intel/fm10k/fm10k_vf.c

index 7dd7ca8fa2bbb274e3c3a6791c287205b063029c..606c0f1e49e676fa3ceecb83d26db6dec9576cde 100644 (file)
@@ -1867,38 +1867,38 @@ static const struct fm10k_msg_data fm10k_msg_data_pf[] = {
 };
 
 static struct fm10k_mac_ops mac_ops_pf = {
-       .get_bus_info           = &fm10k_get_bus_info_generic,
-       .reset_hw               = &fm10k_reset_hw_pf,
-       .init_hw                = &fm10k_init_hw_pf,
-       .start_hw               = &fm10k_start_hw_generic,
-       .stop_hw                = &fm10k_stop_hw_generic,
-       .update_vlan            = &fm10k_update_vlan_pf,
-       .read_mac_addr          = &fm10k_read_mac_addr_pf,
-       .update_uc_addr         = &fm10k_update_uc_addr_pf,
-       .update_mc_addr         = &fm10k_update_mc_addr_pf,
-       .update_xcast_mode      = &fm10k_update_xcast_mode_pf,
-       .update_int_moderator   = &fm10k_update_int_moderator_pf,
-       .update_lport_state     = &fm10k_update_lport_state_pf,
-       .update_hw_stats        = &fm10k_update_hw_stats_pf,
-       .rebind_hw_stats        = &fm10k_rebind_hw_stats_pf,
-       .configure_dglort_map   = &fm10k_configure_dglort_map_pf,
-       .set_dma_mask           = &fm10k_set_dma_mask_pf,
-       .get_fault              = &fm10k_get_fault_pf,
-       .get_host_state         = &fm10k_get_host_state_pf,
-       .adjust_systime         = &fm10k_adjust_systime_pf,
-       .read_systime           = &fm10k_read_systime_pf,
+       .get_bus_info           = fm10k_get_bus_info_generic,
+       .reset_hw               = fm10k_reset_hw_pf,
+       .init_hw                = fm10k_init_hw_pf,
+       .start_hw               = fm10k_start_hw_generic,
+       .stop_hw                = fm10k_stop_hw_generic,
+       .update_vlan            = fm10k_update_vlan_pf,
+       .read_mac_addr          = fm10k_read_mac_addr_pf,
+       .update_uc_addr         = fm10k_update_uc_addr_pf,
+       .update_mc_addr         = fm10k_update_mc_addr_pf,
+       .update_xcast_mode      = fm10k_update_xcast_mode_pf,
+       .update_int_moderator   = fm10k_update_int_moderator_pf,
+       .update_lport_state     = fm10k_update_lport_state_pf,
+       .update_hw_stats        = fm10k_update_hw_stats_pf,
+       .rebind_hw_stats        = fm10k_rebind_hw_stats_pf,
+       .configure_dglort_map   = fm10k_configure_dglort_map_pf,
+       .set_dma_mask           = fm10k_set_dma_mask_pf,
+       .get_fault              = fm10k_get_fault_pf,
+       .get_host_state         = fm10k_get_host_state_pf,
+       .adjust_systime         = fm10k_adjust_systime_pf,
+       .read_systime           = fm10k_read_systime_pf,
 };
 
 static struct fm10k_iov_ops iov_ops_pf = {
-       .assign_resources               = &fm10k_iov_assign_resources_pf,
-       .configure_tc                   = &fm10k_iov_configure_tc_pf,
-       .assign_int_moderator           = &fm10k_iov_assign_int_moderator_pf,
+       .assign_resources               = fm10k_iov_assign_resources_pf,
+       .configure_tc                   = fm10k_iov_configure_tc_pf,
+       .assign_int_moderator           = fm10k_iov_assign_int_moderator_pf,
        .assign_default_mac_vlan        = fm10k_iov_assign_default_mac_vlan_pf,
-       .reset_resources                = &fm10k_iov_reset_resources_pf,
-       .set_lport                      = &fm10k_iov_set_lport_pf,
-       .reset_lport                    = &fm10k_iov_reset_lport_pf,
-       .update_stats                   = &fm10k_iov_update_stats_pf,
-       .report_timestamp               = &fm10k_iov_report_timestamp_pf,
+       .reset_resources                = fm10k_iov_reset_resources_pf,
+       .set_lport                      = fm10k_iov_set_lport_pf,
+       .reset_lport                    = fm10k_iov_reset_lport_pf,
+       .update_stats                   = fm10k_iov_update_stats_pf,
+       .report_timestamp               = fm10k_iov_report_timestamp_pf,
 };
 
 static s32 fm10k_get_invariants_pf(struct fm10k_hw *hw)
@@ -1910,7 +1910,7 @@ static s32 fm10k_get_invariants_pf(struct fm10k_hw *hw)
 
 struct fm10k_info fm10k_pf_info = {
        .mac            = fm10k_mac_pf,
-       .get_invariants = &fm10k_get_invariants_pf,
+       .get_invariants = fm10k_get_invariants_pf,
        .mac_ops        = &mac_ops_pf,
        .iov_ops        = &iov_ops_pf,
 };
index f1dc6e818730a70d1360e92fe81553872ab26cc8..38219f5f51b26b18f8067812432118d44045e12e 100644 (file)
@@ -563,24 +563,24 @@ static const struct fm10k_msg_data fm10k_msg_data_vf[] = {
 };
 
 static struct fm10k_mac_ops mac_ops_vf = {
-       .get_bus_info           = &fm10k_get_bus_info_generic,
-       .reset_hw               = &fm10k_reset_hw_vf,
-       .init_hw                = &fm10k_init_hw_vf,
-       .start_hw               = &fm10k_start_hw_generic,
-       .stop_hw                = &fm10k_stop_hw_vf,
-       .update_vlan            = &fm10k_update_vlan_vf,
-       .read_mac_addr          = &fm10k_read_mac_addr_vf,
-       .update_uc_addr         = &fm10k_update_uc_addr_vf,
-       .update_mc_addr         = &fm10k_update_mc_addr_vf,
-       .update_xcast_mode      = &fm10k_update_xcast_mode_vf,
-       .update_int_moderator   = &fm10k_update_int_moderator_vf,
-       .update_lport_state     = &fm10k_update_lport_state_vf,
-       .update_hw_stats        = &fm10k_update_hw_stats_vf,
-       .rebind_hw_stats        = &fm10k_rebind_hw_stats_vf,
-       .configure_dglort_map   = &fm10k_configure_dglort_map_vf,
-       .get_host_state         = &fm10k_get_host_state_generic,
-       .adjust_systime         = &fm10k_adjust_systime_vf,
-       .read_systime           = &fm10k_read_systime_vf,
+       .get_bus_info           = fm10k_get_bus_info_generic,
+       .reset_hw               = fm10k_reset_hw_vf,
+       .init_hw                = fm10k_init_hw_vf,
+       .start_hw               = fm10k_start_hw_generic,
+       .stop_hw                = fm10k_stop_hw_vf,
+       .update_vlan            = fm10k_update_vlan_vf,
+       .read_mac_addr          = fm10k_read_mac_addr_vf,
+       .update_uc_addr         = fm10k_update_uc_addr_vf,
+       .update_mc_addr         = fm10k_update_mc_addr_vf,
+       .update_xcast_mode      = fm10k_update_xcast_mode_vf,
+       .update_int_moderator   = fm10k_update_int_moderator_vf,
+       .update_lport_state     = fm10k_update_lport_state_vf,
+       .update_hw_stats        = fm10k_update_hw_stats_vf,
+       .rebind_hw_stats        = fm10k_rebind_hw_stats_vf,
+       .configure_dglort_map   = fm10k_configure_dglort_map_vf,
+       .get_host_state         = fm10k_get_host_state_generic,
+       .adjust_systime         = fm10k_adjust_systime_vf,
+       .read_systime           = fm10k_read_systime_vf,
 };
 
 static s32 fm10k_get_invariants_vf(struct fm10k_hw *hw)
@@ -592,6 +592,6 @@ static s32 fm10k_get_invariants_vf(struct fm10k_hw *hw)
 
 struct fm10k_info fm10k_vf_info = {
        .mac            = fm10k_mac_vf,
-       .get_invariants = &fm10k_get_invariants_vf,
+       .get_invariants = fm10k_get_invariants_vf,
        .mac_ops        = &mac_ops_vf,
 };