diff options
author | Matthew Vick <matthew.vick@intel.com> | 2015-01-30 21:23:05 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2015-03-03 04:07:23 -0500 |
commit | eca3204765d1f5438d9ace9b7186030b4c2d5b03 (patch) | |
tree | 655e71a05bfa7a9b83a41d19769ce2a8620bcd69 /drivers/net/ethernet/intel/fm10k/fm10k_pf.c | |
parent | 5bf33dc687e8bf2dfc033930ad06437efeea01d9 (diff) |
fm10k: Resolve various spelling errors and checkpatch warnings
Fix a few silly typos in the code and checkpatch warnings in support of
general code cleanliness.
Signed-off-by: Matthew Vick <matthew.vick@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/fm10k/fm10k_pf.c')
-rw-r--r-- | drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c index 7e4711958e46..159cd8463800 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c | |||
@@ -234,8 +234,7 @@ static s32 fm10k_update_vlan_pf(struct fm10k_hw *hw, u32 vid, u8 vsi, bool set) | |||
234 | vid = (vid << 17) >> 17; | 234 | vid = (vid << 17) >> 17; |
235 | 235 | ||
236 | /* verify the reserved 0 fields are 0 */ | 236 | /* verify the reserved 0 fields are 0 */ |
237 | if (len >= FM10K_VLAN_TABLE_VID_MAX || | 237 | if (len >= FM10K_VLAN_TABLE_VID_MAX || vid >= FM10K_VLAN_TABLE_VID_MAX) |
238 | vid >= FM10K_VLAN_TABLE_VID_MAX) | ||
239 | return FM10K_ERR_PARAM; | 238 | return FM10K_ERR_PARAM; |
240 | 239 | ||
241 | /* Loop through the table updating all required VLANs */ | 240 | /* Loop through the table updating all required VLANs */ |
@@ -312,7 +311,7 @@ bool fm10k_glort_valid_pf(struct fm10k_hw *hw, u16 glort) | |||
312 | } | 311 | } |
313 | 312 | ||
314 | /** | 313 | /** |
315 | * fm10k_update_uc_addr_pf - Update device unicast addresss | 314 | * fm10k_update_xc_addr_pf - Update device addresses |
316 | * @hw: pointer to the HW structure | 315 | * @hw: pointer to the HW structure |
317 | * @glort: base resource tag for this request | 316 | * @glort: base resource tag for this request |
318 | * @mac: MAC address to add/remove from table | 317 | * @mac: MAC address to add/remove from table |
@@ -356,7 +355,7 @@ static s32 fm10k_update_xc_addr_pf(struct fm10k_hw *hw, u16 glort, | |||
356 | } | 355 | } |
357 | 356 | ||
358 | /** | 357 | /** |
359 | * fm10k_update_uc_addr_pf - Update device unicast addresss | 358 | * fm10k_update_uc_addr_pf - Update device unicast addresses |
360 | * @hw: pointer to the HW structure | 359 | * @hw: pointer to the HW structure |
361 | * @glort: base resource tag for this request | 360 | * @glort: base resource tag for this request |
362 | * @mac: MAC address to add/remove from table | 361 | * @mac: MAC address to add/remove from table |
@@ -454,7 +453,7 @@ static void fm10k_update_int_moderator_pf(struct fm10k_hw *hw) | |||
454 | break; | 453 | break; |
455 | } | 454 | } |
456 | 455 | ||
457 | /* always reset VFITR2[0] to point to last enabled PF vector*/ | 456 | /* always reset VFITR2[0] to point to last enabled PF vector */ |
458 | fm10k_write_reg(hw, FM10K_ITR2(FM10K_ITR_REG_COUNT_PF), i); | 457 | fm10k_write_reg(hw, FM10K_ITR2(FM10K_ITR_REG_COUNT_PF), i); |
459 | 458 | ||
460 | /* reset ITR2[0] to point to last enabled PF vector */ | 459 | /* reset ITR2[0] to point to last enabled PF vector */ |
@@ -812,7 +811,7 @@ static s32 fm10k_iov_assign_int_moderator_pf(struct fm10k_hw *hw, u16 vf_idx) | |||
812 | if (vf_idx >= hw->iov.num_vfs) | 811 | if (vf_idx >= hw->iov.num_vfs) |
813 | return FM10K_ERR_PARAM; | 812 | return FM10K_ERR_PARAM; |
814 | 813 | ||
815 | /* determine vector offset and count*/ | 814 | /* determine vector offset and count */ |
816 | vf_v_idx = fm10k_vf_vector_index(hw, vf_idx); | 815 | vf_v_idx = fm10k_vf_vector_index(hw, vf_idx); |
817 | vf_v_limit = vf_v_idx + fm10k_vectors_per_pool(hw); | 816 | vf_v_limit = vf_v_idx + fm10k_vectors_per_pool(hw); |
818 | 817 | ||
@@ -951,7 +950,7 @@ static s32 fm10k_iov_reset_resources_pf(struct fm10k_hw *hw, | |||
951 | if (vf_info->mbx.ops.disconnect) | 950 | if (vf_info->mbx.ops.disconnect) |
952 | vf_info->mbx.ops.disconnect(hw, &vf_info->mbx); | 951 | vf_info->mbx.ops.disconnect(hw, &vf_info->mbx); |
953 | 952 | ||
954 | /* determine vector offset and count*/ | 953 | /* determine vector offset and count */ |
955 | vf_v_idx = fm10k_vf_vector_index(hw, vf_idx); | 954 | vf_v_idx = fm10k_vf_vector_index(hw, vf_idx); |
956 | vf_v_limit = vf_v_idx + fm10k_vectors_per_pool(hw); | 955 | vf_v_limit = vf_v_idx + fm10k_vectors_per_pool(hw); |
957 | 956 | ||
@@ -1035,7 +1034,7 @@ static s32 fm10k_iov_reset_resources_pf(struct fm10k_hw *hw, | |||
1035 | ((u32)vf_info->mac[2]); | 1034 | ((u32)vf_info->mac[2]); |
1036 | } | 1035 | } |
1037 | 1036 | ||
1038 | /* map queue pairs back to VF from last to first*/ | 1037 | /* map queue pairs back to VF from last to first */ |
1039 | for (i = queues_per_pool; i--;) { | 1038 | for (i = queues_per_pool; i--;) { |
1040 | fm10k_write_reg(hw, FM10K_TDBAL(vf_q_idx + i), tdbal); | 1039 | fm10k_write_reg(hw, FM10K_TDBAL(vf_q_idx + i), tdbal); |
1041 | fm10k_write_reg(hw, FM10K_TDBAH(vf_q_idx + i), tdbah); | 1040 | fm10k_write_reg(hw, FM10K_TDBAH(vf_q_idx + i), tdbah); |
@@ -1141,7 +1140,7 @@ static s32 fm10k_iov_report_timestamp_pf(struct fm10k_hw *hw, | |||
1141 | * | 1140 | * |
1142 | * This function is a default handler for MSI-X requests from the VF. The | 1141 | * This function is a default handler for MSI-X requests from the VF. The |
1143 | * assumption is that in this case it is acceptable to just directly | 1142 | * assumption is that in this case it is acceptable to just directly |
1144 | * hand off the message form the VF to the underlying shared code. | 1143 | * hand off the message from the VF to the underlying shared code. |
1145 | **/ | 1144 | **/ |
1146 | s32 fm10k_iov_msg_msix_pf(struct fm10k_hw *hw, u32 **results, | 1145 | s32 fm10k_iov_msg_msix_pf(struct fm10k_hw *hw, u32 **results, |
1147 | struct fm10k_mbx_info *mbx) | 1146 | struct fm10k_mbx_info *mbx) |
@@ -1160,7 +1159,7 @@ s32 fm10k_iov_msg_msix_pf(struct fm10k_hw *hw, u32 **results, | |||
1160 | * | 1159 | * |
1161 | * This function is a default handler for MAC/VLAN requests from the VF. | 1160 | * This function is a default handler for MAC/VLAN requests from the VF. |
1162 | * The assumption is that in this case it is acceptable to just directly | 1161 | * The assumption is that in this case it is acceptable to just directly |
1163 | * hand off the message form the VF to the underlying shared code. | 1162 | * hand off the message from the VF to the underlying shared code. |
1164 | **/ | 1163 | **/ |
1165 | s32 fm10k_iov_msg_mac_vlan_pf(struct fm10k_hw *hw, u32 **results, | 1164 | s32 fm10k_iov_msg_mac_vlan_pf(struct fm10k_hw *hw, u32 **results, |
1166 | struct fm10k_mbx_info *mbx) | 1165 | struct fm10k_mbx_info *mbx) |
@@ -1404,7 +1403,7 @@ static void fm10k_update_hw_stats_pf(struct fm10k_hw *hw, | |||
1404 | &stats->vlan_drop); | 1403 | &stats->vlan_drop); |
1405 | loopback_drop = fm10k_read_hw_stats_32b(hw, | 1404 | loopback_drop = fm10k_read_hw_stats_32b(hw, |
1406 | FM10K_STATS_LOOPBACK_DROP, | 1405 | FM10K_STATS_LOOPBACK_DROP, |
1407 | &stats->loopback_drop); | 1406 | &stats->loopback_drop); |
1408 | nodesc_drop = fm10k_read_hw_stats_32b(hw, | 1407 | nodesc_drop = fm10k_read_hw_stats_32b(hw, |
1409 | FM10K_STATS_NODESC_DROP, | 1408 | FM10K_STATS_NODESC_DROP, |
1410 | &stats->nodesc_drop); | 1409 | &stats->nodesc_drop); |
@@ -1573,7 +1572,7 @@ static s32 fm10k_get_host_state_pf(struct fm10k_hw *hw, bool *switch_ready) | |||
1573 | s32 ret_val = 0; | 1572 | s32 ret_val = 0; |
1574 | u32 dma_ctrl2; | 1573 | u32 dma_ctrl2; |
1575 | 1574 | ||
1576 | /* verify the switch is ready for interraction */ | 1575 | /* verify the switch is ready for interaction */ |
1577 | dma_ctrl2 = fm10k_read_reg(hw, FM10K_DMA_CTRL2); | 1576 | dma_ctrl2 = fm10k_read_reg(hw, FM10K_DMA_CTRL2); |
1578 | if (!(dma_ctrl2 & FM10K_DMA_CTRL2_SWITCH_READY)) | 1577 | if (!(dma_ctrl2 & FM10K_DMA_CTRL2_SWITCH_READY)) |
1579 | goto out; | 1578 | goto out; |