Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5d5b7c39cfdc459c079ed75b65a537f40ffb82da

Authored by Emil Tantilov
Committed by David S. Miller
1 parent f32f837b75
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ixgbe: declare functions as static 

Following patch fixes warnings reported by `make namespacecheck`

Reported by Stephen Hemminger

CC: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Stephen Ko <stephen.s.ko@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 11 changed files with 40 additions and 86 deletions Side-by-side Diff

drivers/net/ixgbe/ixgbe_82599.c
Diff comments   View file @ 5d5b7c3
... ... @@ -39,20 +39,20 @@
39 39 #define IXGBE_82599_MC_TBL_SIZE 128
40 40 #define IXGBE_82599_VFT_TBL_SIZE 128
41 41  
42   -void ixgbe_disable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);
43   -void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);
44   -void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);
45   -s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
46   - ixgbe_link_speed speed,
47   - bool autoneg,
48   - bool autoneg_wait_to_complete);
  42 +static void ixgbe_disable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);
  43 +static void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);
  44 +static void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);
  45 +static s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
  46 + ixgbe_link_speed speed,
  47 + bool autoneg,
  48 + bool autoneg_wait_to_complete);
49 49 static s32 ixgbe_setup_mac_link_smartspeed(struct ixgbe_hw *hw,
50 50 ixgbe_link_speed speed,
51 51 bool autoneg,
52 52 bool autoneg_wait_to_complete);
53   -s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw,
54   - bool autoneg_wait_to_complete);
55   -s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,
  53 +static s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw,
  54 + bool autoneg_wait_to_complete);
  55 +static s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,
56 56 ixgbe_link_speed speed,
57 57 bool autoneg,
58 58 bool autoneg_wait_to_complete);
... ... @@ -369,7 +369,7 @@
369 369 * Configures link settings based on values in the ixgbe_hw struct.
370 370 * Restarts the link. Performs autonegotiation if needed.
371 371 **/
372   -s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw,
  372 +static s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw,
373 373 bool autoneg_wait_to_complete)
374 374 {
375 375 u32 autoc_reg;
... ... @@ -418,7 +418,7 @@
418 418 * PHY states. This includes selectively shutting down the Tx
419 419 * laser on the PHY, effectively halting physical link.
420 420 **/
421   -void ixgbe_disable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
  421 +static void ixgbe_disable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
422 422 {
423 423 u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP);
424 424  
... ... @@ -437,7 +437,7 @@
437 437 * PHY states. This includes selectively turning on the Tx
438 438 * laser on the PHY, effectively starting physical link.
439 439 **/
440   -void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
  440 +static void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
441 441 {
442 442 u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP);
443 443  
... ... @@ -460,7 +460,7 @@
460 460 * end. This is consistent with true clause 37 autoneg, which also
461 461 * involves a loss of signal.
462 462 **/
463   -void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
  463 +static void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
464 464 {
465 465 hw_dbg(hw, "ixgbe_flap_tx_laser_multispeed_fiber\n");
466 466  
... ... @@ -729,7 +729,7 @@
729 729 *
730 730 * Set the link speed in the AUTOC register and restarts link.
731 731 **/
732   -s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,
  732 +static s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,
733 733 ixgbe_link_speed speed, bool autoneg,
734 734 bool autoneg_wait_to_complete)
735 735 {
drivers/net/ixgbe/ixgbe_common.c
Diff comments   View file @ 5d5b7c3
... ... @@ -52,6 +52,7 @@
52 52 static s32 ixgbe_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr);
53 53 static void ixgbe_add_uc_addr(struct ixgbe_hw *hw, u8 *addr, u32 vmdq);
54 54 static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num);
  55 +static s32 ixgbe_poll_eerd_eewr_done(struct ixgbe_hw *hw, u32 ee_reg);
55 56  
56 57 /**
57 58 * ixgbe_start_hw_generic - Prepare hardware for Tx/Rx
... ... @@ -637,7 +638,7 @@
637 638 * Polls the status bit (bit 1) of the EERD or EEWR to determine when the
638 639 * read or write is done respectively.
639 640 **/
640   -s32 ixgbe_poll_eerd_eewr_done(struct ixgbe_hw *hw, u32 ee_reg)
  641 +static s32 ixgbe_poll_eerd_eewr_done(struct ixgbe_hw *hw, u32 ee_reg)
641 642 {
642 643 u32 i;
643 644 u32 reg;
... ... @@ -2449,7 +2450,7 @@
2449 2450 * return the VLVF index where this VLAN id should be placed
2450 2451 *
2451 2452 **/
2452   -s32 ixgbe_find_vlvf_slot(struct ixgbe_hw *hw, u32 vlan)
  2453 +static s32 ixgbe_find_vlvf_slot(struct ixgbe_hw *hw, u32 vlan)
2453 2454 {
2454 2455 u32 bits = 0;
2455 2456 u32 first_empty_slot = 0;
drivers/net/ixgbe/ixgbe_common.h
Diff comments   View file @ 5d5b7c3
... ... @@ -52,7 +52,6 @@
52 52 s32 ixgbe_validate_eeprom_checksum_generic(struct ixgbe_hw *hw,
53 53 u16 *checksum_val);
54 54 s32 ixgbe_update_eeprom_checksum_generic(struct ixgbe_hw *hw);
55   -s32 ixgbe_poll_eerd_eewr_done(struct ixgbe_hw *hw, u32 ee_reg);
56 55  
57 56 s32 ixgbe_set_rar_generic(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
58 57 u32 enable_addr);
drivers/net/ixgbe/ixgbe_dcb_82598.c
Diff comments   View file @ 5d5b7c3
... ... @@ -78,7 +78,7 @@
78 78 *
79 79 * Configure Rx Data Arbiter and credits for each traffic class.
80 80 */
81   -s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
  81 +static s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
82 82 struct ixgbe_dcb_config *dcb_config)
83 83 {
84 84 struct tc_bw_alloc *p;
... ... @@ -135,7 +135,7 @@
135 135 *
136 136 * Configure Tx Descriptor Arbiter and credits for each traffic class.
137 137 */
138   -s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
  138 +static s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
139 139 struct ixgbe_dcb_config *dcb_config)
140 140 {
141 141 struct tc_bw_alloc *p;
... ... @@ -183,7 +183,7 @@
183 183 *
184 184 * Configure Tx Data Arbiter and credits for each traffic class.
185 185 */
186   -s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
  186 +static s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
187 187 struct ixgbe_dcb_config *dcb_config)
188 188 {
189 189 struct tc_bw_alloc *p;
... ... @@ -296,7 +296,7 @@
296 296 * Configure queue statistics registers, all queues belonging to same traffic
297 297 * class uses a single set of queue statistics counters.
298 298 */
299   -s32 ixgbe_dcb_config_tc_stats_82598(struct ixgbe_hw *hw)
  299 +static s32 ixgbe_dcb_config_tc_stats_82598(struct ixgbe_hw *hw)
300 300 {
301 301 u32 reg = 0;
302 302 u8 i = 0;
drivers/net/ixgbe/ixgbe_dcb_82598.h
Diff comments   View file @ 5d5b7c3
... ... @@ -73,17 +73,6 @@
73 73 /* DCB PFC functions */
74 74 s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *, struct ixgbe_dcb_config *);
75 75  
76   -/* DCB traffic class stats */
77   -s32 ixgbe_dcb_config_tc_stats_82598(struct ixgbe_hw *);
78   -
79   -/* DCB config arbiters */
80   -s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *,
81   - struct ixgbe_dcb_config *);
82   -s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *,
83   - struct ixgbe_dcb_config *);
84   -s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *,
85   - struct ixgbe_dcb_config *);
86   -
87 76 /* DCB hw initialization */
88 77 s32 ixgbe_dcb_hw_config_82598(struct ixgbe_hw *, struct ixgbe_dcb_config *);
89 78  
drivers/net/ixgbe/ixgbe_dcb_82599.c
Diff comments   View file @ 5d5b7c3
... ... @@ -37,7 +37,7 @@
37 37 *
38 38 * Configure packet buffers for DCB mode.
39 39 */
40   -s32 ixgbe_dcb_config_packet_buffers_82599(struct ixgbe_hw *hw,
  40 +static s32 ixgbe_dcb_config_packet_buffers_82599(struct ixgbe_hw *hw,
41 41 struct ixgbe_dcb_config *dcb_config)
42 42 {
43 43 s32 ret_val = 0;
... ... @@ -79,7 +79,7 @@
79 79 *
80 80 * Configure Rx Packet Arbiter and credits for each traffic class.
81 81 */
82   -s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
  82 +static s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
83 83 struct ixgbe_dcb_config *dcb_config)
84 84 {
85 85 struct tc_bw_alloc *p;
... ... @@ -134,7 +134,7 @@
134 134 *
135 135 * Configure Tx Descriptor Arbiter and credits for each traffic class.
136 136 */
137   -s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
  137 +static s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
138 138 struct ixgbe_dcb_config *dcb_config)
139 139 {
140 140 struct tc_bw_alloc *p;
... ... @@ -181,7 +181,7 @@
181 181 *
182 182 * Configure Tx Packet Arbiter and credits for each traffic class.
183 183 */
184   -s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
  184 +static s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
185 185 struct ixgbe_dcb_config *dcb_config)
186 186 {
187 187 struct tc_bw_alloc *p;
... ... @@ -302,7 +302,7 @@
302 302 * Configure queue statistics registers, all queues belonging to same traffic
303 303 * class uses a single set of queue statistics counters.
304 304 */
305   -s32 ixgbe_dcb_config_tc_stats_82599(struct ixgbe_hw *hw)
  305 +static s32 ixgbe_dcb_config_tc_stats_82599(struct ixgbe_hw *hw)
306 306 {
307 307 u32 reg = 0;
308 308 u8 i = 0;
... ... @@ -355,7 +355,7 @@
355 355 *
356 356 * Configure general DCB parameters.
357 357 */
358   -s32 ixgbe_dcb_config_82599(struct ixgbe_hw *hw)
  358 +static s32 ixgbe_dcb_config_82599(struct ixgbe_hw *hw)
359 359 {
360 360 u32 reg;
361 361 u32 q;
drivers/net/ixgbe/ixgbe_dcb_82599.h
Diff comments   View file @ 5d5b7c3
... ... @@ -102,18 +102,6 @@
102 102 s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw,
103 103 struct ixgbe_dcb_config *dcb_config);
104 104  
105   -/* DCB traffic class stats */
106   -s32 ixgbe_dcb_config_tc_stats_82599(struct ixgbe_hw *hw);
107   -
108   -/* DCB config arbiters */
109   -s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
110   - struct ixgbe_dcb_config *dcb_config);
111   -s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
112   - struct ixgbe_dcb_config *dcb_config);
113   -s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
114   - struct ixgbe_dcb_config *dcb_config);
115   -
116   -
117 105 /* DCB hw initialization */
118 106 s32 ixgbe_dcb_hw_config_82599(struct ixgbe_hw *hw,
119 107 struct ixgbe_dcb_config *config);
drivers/net/ixgbe/ixgbe_mbx.c
Diff comments   View file @ 5d5b7c3
... ... @@ -200,7 +200,8 @@
200 200 * returns SUCCESS if it successfully received a message notification and
201 201 * copied it into the receive buffer.
202 202 **/
203   -s32 ixgbe_read_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size, u16 mbx_id)
  203 +static s32 ixgbe_read_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size,
  204 + u16 mbx_id)
204 205 {
205 206 struct ixgbe_mbx_info *mbx = &hw->mbx;
206 207 s32 ret_val = IXGBE_ERR_MBX;
... ... @@ -227,7 +228,7 @@
227 228 * returns SUCCESS if it successfully copied message into the buffer and
228 229 * received an ack to that message within delay * timeout period
229 230 **/
230   -s32 ixgbe_write_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size,
  231 +static s32 ixgbe_write_posted_mbx(struct ixgbe_hw *hw, u32 *msg, u16 size,
231 232 u16 mbx_id)
232 233 {
233 234 struct ixgbe_mbx_info *mbx = &hw->mbx;
... ... @@ -245,20 +246,6 @@
245 246 ret_val = ixgbe_poll_for_ack(hw, mbx_id);
246 247 out:
247 248 return ret_val;
248   -}
249   -
250   -/**
251   - * ixgbe_init_mbx_ops_generic - Initialize MB function pointers
252   - * @hw: pointer to the HW structure
253   - *
254   - * Setup the mailbox read and write message function pointers
255   - **/
256   -void ixgbe_init_mbx_ops_generic(struct ixgbe_hw *hw)
257   -{
258   - struct ixgbe_mbx_info *mbx = &hw->mbx;
259   -
260   - mbx->ops.read_posted = ixgbe_read_posted_mbx;
261   - mbx->ops.write_posted = ixgbe_write_posted_mbx;
262 249 }
263 250  
264 251 static s32 ixgbe_check_for_bit_pf(struct ixgbe_hw *hw, u32 mask, s32 index)
drivers/net/ixgbe/ixgbe_mbx.h
Diff comments   View file @ 5d5b7c3
... ... @@ -83,12 +83,9 @@
83 83  
84 84 s32 ixgbe_read_mbx(struct ixgbe_hw *, u32 *, u16, u16);
85 85 s32 ixgbe_write_mbx(struct ixgbe_hw *, u32 *, u16, u16);
86   -s32 ixgbe_read_posted_mbx(struct ixgbe_hw *, u32 *, u16, u16);
87   -s32 ixgbe_write_posted_mbx(struct ixgbe_hw *, u32 *, u16, u16);
88 86 s32 ixgbe_check_for_msg(struct ixgbe_hw *, u16);
89 87 s32 ixgbe_check_for_ack(struct ixgbe_hw *, u16);
90 88 s32 ixgbe_check_for_rst(struct ixgbe_hw *, u16);
91   -void ixgbe_init_mbx_ops_generic(struct ixgbe_hw *hw);
92 89 void ixgbe_init_mbx_params_pf(struct ixgbe_hw *);
93 90  
94 91 extern struct ixgbe_mbx_operations mbx_ops_82599;
drivers/net/ixgbe/ixgbe_sriov.c
Diff comments   View file @ 5d5b7c3
... ... @@ -43,8 +43,8 @@
43 43  
44 44 #include "ixgbe_sriov.h"
45 45  
46   -int ixgbe_set_vf_multicasts(struct ixgbe_adapter *adapter,
47   - int entries, u16 *hash_list, u32 vf)
  46 +static int ixgbe_set_vf_multicasts(struct ixgbe_adapter *adapter,
  47 + int entries, u16 *hash_list, u32 vf)
48 48 {
49 49 struct vf_data_storage *vfinfo = &adapter->vfinfo[vf];
50 50 struct ixgbe_hw *hw = &adapter->hw;
51 51  
... ... @@ -104,13 +104,14 @@
104 104 }
105 105 }
106 106  
107   -int ixgbe_set_vf_vlan(struct ixgbe_adapter *adapter, int add, int vid, u32 vf)
  107 +static int ixgbe_set_vf_vlan(struct ixgbe_adapter *adapter, int add, int vid,
  108 + u32 vf)
108 109 {
109 110 return adapter->hw.mac.ops.set_vfta(&adapter->hw, vid, vf, (bool)add);
110 111 }
111 112  
112 113  
113   -void ixgbe_set_vmolr(struct ixgbe_hw *hw, u32 vf, bool aupe)
  114 +static void ixgbe_set_vmolr(struct ixgbe_hw *hw, u32 vf, bool aupe)
114 115 {
115 116 u32 vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf));
116 117 vmolr |= (IXGBE_VMOLR_ROMPE |
... ... @@ -134,7 +135,7 @@
134 135 IXGBE_WRITE_REG(hw, IXGBE_VMVIR(vf), 0);
135 136 }
136 137  
137   -inline void ixgbe_vf_reset_event(struct ixgbe_adapter *adapter, u32 vf)
  138 +static inline void ixgbe_vf_reset_event(struct ixgbe_adapter *adapter, u32 vf)
138 139 {
139 140 struct ixgbe_hw *hw = &adapter->hw;
140 141 int rar_entry = hw->mac.num_rar_entries - (vf + 1);
... ... @@ -162,8 +163,8 @@
162 163 hw->mac.ops.clear_rar(hw, rar_entry);
163 164 }
164 165  
165   -int ixgbe_set_vf_mac(struct ixgbe_adapter *adapter,
166   - int vf, unsigned char *mac_addr)
  166 +static int ixgbe_set_vf_mac(struct ixgbe_adapter *adapter,
  167 + int vf, unsigned char *mac_addr)
167 168 {
168 169 struct ixgbe_hw *hw = &adapter->hw;
169 170 int rar_entry = hw->mac.num_rar_entries - (vf + 1);
... ... @@ -197,7 +198,7 @@
197 198 return 0;
198 199 }
199 200  
200   -inline void ixgbe_vf_reset_msg(struct ixgbe_adapter *adapter, u32 vf)
  201 +static inline void ixgbe_vf_reset_msg(struct ixgbe_adapter *adapter, u32 vf)
201 202 {
202 203 struct ixgbe_hw *hw = &adapter->hw;
203 204 u32 reg;
drivers/net/ixgbe/ixgbe_sriov.h
Diff comments   View file @ 5d5b7c3
... ... @@ -28,16 +28,8 @@
28 28 #ifndef _IXGBE_SRIOV_H_
29 29 #define _IXGBE_SRIOV_H_
30 30  
31   -int ixgbe_set_vf_multicasts(struct ixgbe_adapter *adapter,
32   - int entries, u16 *hash_list, u32 vf);
33 31 void ixgbe_restore_vf_multicasts(struct ixgbe_adapter *adapter);
34   -int ixgbe_set_vf_vlan(struct ixgbe_adapter *adapter, int add, int vid, u32 vf);
35   -void ixgbe_set_vmolr(struct ixgbe_hw *hw, u32 vf, bool aupe);
36   -void ixgbe_vf_reset_event(struct ixgbe_adapter *adapter, u32 vf);
37   -void ixgbe_vf_reset_msg(struct ixgbe_adapter *adapter, u32 vf);
38 32 void ixgbe_msg_task(struct ixgbe_adapter *adapter);
39   -int ixgbe_set_vf_mac(struct ixgbe_adapter *adapter,
40   - int vf, unsigned char *mac_addr);
41 33 int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask);
42 34 void ixgbe_disable_tx_rx(struct ixgbe_adapter *adapter);
43 35 void ixgbe_ping_all_vfs(struct ixgbe_adapter *adapter);