Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ice: Trivial fixes

This is a collection of trivial fixes including fixing whitespace, typos,
function headers, reverse Christmas tree, etc.

Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

authored by

Tony Nguyen and committed by
Jeff Kirsher
4ee656bb 1d8bd992

+31 -29
+1
drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
··· 1660 1660 __le32 count; 1661 1661 struct ice_aqc_get_pkg_info pkg_info[1]; 1662 1662 }; 1663 + 1663 1664 /** 1664 1665 * struct ice_aq_desc - Admin Queue (AQ) descriptor 1665 1666 * @flags: ICE_AQ_FLAG_* flags
+2 -2
drivers/net/ethernet/intel/ice/ice_common.c
··· 588 588 } 589 589 590 590 /** 591 - * ice_get_itr_intrl_gran - determine int/intrl granularity 591 + * ice_get_itr_intrl_gran 592 592 * @hw: pointer to the HW struct 593 593 * 594 - * Determines the ITR/intrl granularities based on the maximum aggregate 594 + * Determines the ITR/INTRL granularities based on the maximum aggregate 595 595 * bandwidth according to the device's configuration during power-on. 596 596 */ 597 597 static void ice_get_itr_intrl_gran(struct ice_hw *hw)
+4 -4
drivers/net/ethernet/intel/ice/ice_dcb.c
··· 1323 1323 } 1324 1324 1325 1325 /** 1326 - * ice_aq_query_port_ets - query port ets configuration 1326 + * ice_aq_query_port_ets - query port ETS configuration 1327 1327 * @pi: port information structure 1328 1328 * @buf: pointer to buffer 1329 1329 * @buf_size: buffer size in bytes 1330 1330 * @cd: pointer to command details structure or NULL 1331 1331 * 1332 - * query current port ets configuration 1332 + * query current port ETS configuration 1333 1333 */ 1334 1334 static enum ice_status 1335 1335 ice_aq_query_port_ets(struct ice_port_info *pi, ··· 1416 1416 } 1417 1417 1418 1418 /** 1419 - * ice_query_port_ets - query port ets configuration 1419 + * ice_query_port_ets - query port ETS configuration 1420 1420 * @pi: port information structure 1421 1421 * @buf: pointer to buffer 1422 1422 * @buf_size: buffer size in bytes 1423 1423 * @cd: pointer to command details structure or NULL 1424 1424 * 1425 - * query current port ets configuration and update the 1425 + * query current port ETS configuration and update the 1426 1426 * SW DB with the TC changes 1427 1427 */ 1428 1428 enum ice_status
+2 -2
drivers/net/ethernet/intel/ice/ice_dcb_lib.c
··· 412 412 } 413 413 414 414 /** 415 - * ice_dcb_sw_default_config - Apply a default DCB config 415 + * ice_dcb_sw_dflt_cfg - Apply a default DCB config 416 416 * @pf: PF to apply config to 417 - * @ets_willing: configure ets willing 417 + * @ets_willing: configure ETS willing 418 418 * @locked: was this function called with RTNL held 419 419 */ 420 420 static int ice_dcb_sw_dflt_cfg(struct ice_pf *pf, bool ets_willing, bool locked)
+7 -7
drivers/net/ethernet/intel/ice/ice_ethtool.c
··· 3800 3800 static const struct ethtool_ops ice_ethtool_ops = { 3801 3801 .get_link_ksettings = ice_get_link_ksettings, 3802 3802 .set_link_ksettings = ice_set_link_ksettings, 3803 - .get_drvinfo = ice_get_drvinfo, 3804 - .get_regs_len = ice_get_regs_len, 3805 - .get_regs = ice_get_regs, 3806 - .get_msglevel = ice_get_msglevel, 3807 - .set_msglevel = ice_set_msglevel, 3803 + .get_drvinfo = ice_get_drvinfo, 3804 + .get_regs_len = ice_get_regs_len, 3805 + .get_regs = ice_get_regs, 3806 + .get_msglevel = ice_get_msglevel, 3807 + .set_msglevel = ice_set_msglevel, 3808 3808 .self_test = ice_self_test, 3809 3809 .get_link = ethtool_op_get_link, 3810 3810 .get_eeprom_len = ice_get_eeprom_len, ··· 3831 3831 .get_channels = ice_get_channels, 3832 3832 .set_channels = ice_set_channels, 3833 3833 .get_ts_info = ethtool_op_get_ts_info, 3834 - .get_per_queue_coalesce = ice_get_per_q_coalesce, 3835 - .set_per_queue_coalesce = ice_set_per_q_coalesce, 3834 + .get_per_queue_coalesce = ice_get_per_q_coalesce, 3835 + .set_per_queue_coalesce = ice_set_per_q_coalesce, 3836 3836 .get_fecparam = ice_get_fecparam, 3837 3837 .set_fecparam = ice_set_fecparam, 3838 3838 .get_module_info = ice_get_module_info,
+4 -3
drivers/net/ethernet/intel/ice/ice_lib.c
··· 1230 1230 * 1231 1231 * Returns 0 on success or ENOMEM on failure. 1232 1232 */ 1233 - int ice_add_mac_to_list(struct ice_vsi *vsi, struct list_head *add_list, 1234 - const u8 *macaddr) 1233 + int 1234 + ice_add_mac_to_list(struct ice_vsi *vsi, struct list_head *add_list, 1235 + const u8 *macaddr) 1235 1236 { 1236 1237 struct ice_fltr_list_entry *tmp; 1237 1238 struct ice_pf *pf = vsi->back; ··· 2825 2824 int ice_vsi_cfg_tc(struct ice_vsi *vsi, u8 ena_tc) 2826 2825 { 2827 2826 u16 max_txqs[ICE_MAX_TRAFFIC_CLASS] = { 0 }; 2828 - struct ice_vsi_ctx *ctx; 2829 2827 struct ice_pf *pf = vsi->back; 2828 + struct ice_vsi_ctx *ctx; 2830 2829 enum ice_status status; 2831 2830 struct device *dev; 2832 2831 int i, ret = 0;
+3 -1
drivers/net/ethernet/intel/ice/ice_main.c
··· 3153 3153 struct ice_hw *hw; 3154 3154 int err; 3155 3155 3156 - /* this driver uses devres, see Documentation/driver-api/driver-model/devres.rst */ 3156 + /* this driver uses devres, see 3157 + * Documentation/driver-api/driver-model/devres.rst 3158 + */ 3157 3159 err = pcim_enable_device(pdev); 3158 3160 if (err) 3159 3161 return err;
+4 -5
drivers/net/ethernet/intel/ice/ice_txrx.c
··· 644 644 * Update the offset within page so that Rx buf will be ready to be reused. 645 645 * For systems with PAGE_SIZE < 8192 this function will flip the page offset 646 646 * so the second half of page assigned to Rx buffer will be used, otherwise 647 - * the offset is moved by the @size bytes 647 + * the offset is moved by "size" bytes 648 648 */ 649 649 static void 650 650 ice_rx_buf_adjust_pg_offset(struct ice_rx_buf *rx_buf, unsigned int size) ··· 1619 1619 { 1620 1620 u64 td_offset, td_tag, td_cmd; 1621 1621 u16 i = tx_ring->next_to_use; 1622 - skb_frag_t *frag; 1623 1622 unsigned int data_len, size; 1624 1623 struct ice_tx_desc *tx_desc; 1625 1624 struct ice_tx_buf *tx_buf; 1626 1625 struct sk_buff *skb; 1626 + skb_frag_t *frag; 1627 1627 dma_addr_t dma; 1628 1628 1629 1629 td_tag = off->td_l2tag1; ··· 1736 1736 ice_maybe_stop_tx(tx_ring, DESC_NEEDED); 1737 1737 1738 1738 /* notify HW of packet */ 1739 - if (netif_xmit_stopped(txring_txq(tx_ring)) || !netdev_xmit_more()) { 1739 + if (netif_xmit_stopped(txring_txq(tx_ring)) || !netdev_xmit_more()) 1740 1740 writel(i, tx_ring->tail); 1741 - } 1742 1741 1743 1742 return; 1744 1743 ··· 2075 2076 frag = &skb_shinfo(skb)->frags[0]; 2076 2077 2077 2078 /* Initialize size to the negative value of gso_size minus 1. We 2078 - * use this as the worst case scenerio in which the frag ahead 2079 + * use this as the worst case scenario in which the frag ahead 2079 2080 * of us only provides one byte which is why we are limited to 6 2080 2081 * descriptors for a single transmit as the header and previous 2081 2082 * fragment are already consuming 2 descriptors.
+2 -2
drivers/net/ethernet/intel/ice/ice_txrx.h
··· 33 33 * frame. 34 34 * 35 35 * Note: For cache line sizes 256 or larger this value is going to end 36 - * up negative. In these cases we should fall back to the legacy 37 - * receive path. 36 + * up negative. In these cases we should fall back to the legacy 37 + * receive path. 38 38 */ 39 39 #if (PAGE_SIZE < 8192) 40 40 #define ICE_2K_TOO_SMALL_WITH_PADDING \
+1 -1
drivers/net/ethernet/intel/ice/ice_type.h
··· 517 517 struct ice_fw_log_cfg fw_log; 518 518 519 519 /* Device max aggregate bandwidths corresponding to the GL_PWR_MODE_CTL 520 - * register. Used for determining the ITR/intrl granularity during 520 + * register. Used for determining the ITR/INTRL granularity during 521 521 * initialization. 522 522 */ 523 523 #define ICE_MAX_AGG_BW_200G 0x0
+1 -2
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
··· 1093 1093 * finished resetting. 1094 1094 */ 1095 1095 for (i = 0, v = 0; i < 10 && v < pf->num_alloc_vfs; i++) { 1096 - 1097 1096 /* Check each VF in sequence */ 1098 1097 while (v < pf->num_alloc_vfs) { 1099 1098 u32 reg; ··· 2636 2637 struct ice_pf *pf = vf->pf; 2637 2638 u16 max_allowed_vf_queues; 2638 2639 u16 tx_rx_queue_left; 2639 - u16 cur_queues; 2640 2640 struct device *dev; 2641 + u16 cur_queues; 2641 2642 2642 2643 dev = ice_pf_to_dev(pf); 2643 2644 if (!test_bit(ICE_VF_STATE_ACTIVE, vf->vf_states)) {