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

ice: Rename build_ctob to ice_build_ctob

To make the function easier to identify as being part of the ice driver,
prepend ice to the function name.

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
5757cc7c c522d1f6

+11 -10
+6 -5
drivers/net/ethernet/intel/ice/ice_txrx.c
··· 1680 1680 */ 1681 1681 while (unlikely(size > ICE_MAX_DATA_PER_TXD)) { 1682 1682 tx_desc->cmd_type_offset_bsz = 1683 - build_ctob(td_cmd, td_offset, max_data, td_tag); 1683 + ice_build_ctob(td_cmd, td_offset, max_data, 1684 + td_tag); 1684 1685 1685 1686 tx_desc++; 1686 1687 i++; ··· 1701 1700 if (likely(!data_len)) 1702 1701 break; 1703 1702 1704 - tx_desc->cmd_type_offset_bsz = build_ctob(td_cmd, td_offset, 1705 - size, td_tag); 1703 + tx_desc->cmd_type_offset_bsz = ice_build_ctob(td_cmd, td_offset, 1704 + size, td_tag); 1706 1705 1707 1706 tx_desc++; 1708 1707 i++; ··· 1733 1732 1734 1733 /* write last descriptor with RS and EOP bits */ 1735 1734 td_cmd |= (u64)ICE_TXD_LAST_DESC_CMD; 1736 - tx_desc->cmd_type_offset_bsz = build_ctob(td_cmd, td_offset, size, 1737 - td_tag); 1735 + tx_desc->cmd_type_offset_bsz = 1736 + ice_build_ctob(td_cmd, td_offset, size, td_tag); 1738 1737 1739 1738 /* Force memory writes to complete before letting h/w know there 1740 1739 * are new descriptors to fetch.
+2 -2
drivers/net/ethernet/intel/ice/ice_txrx_lib.c
··· 232 232 233 233 tx_desc = ICE_TX_DESC(xdp_ring, i); 234 234 tx_desc->buf_addr = cpu_to_le64(dma); 235 - tx_desc->cmd_type_offset_bsz = build_ctob(ICE_TXD_LAST_DESC_CMD, 0, 236 - size, 0); 235 + tx_desc->cmd_type_offset_bsz = ice_build_ctob(ICE_TXD_LAST_DESC_CMD, 0, 236 + size, 0); 237 237 238 238 /* Make certain all of the status bits have been updated 239 239 * before next_to_watch is written.
+1 -1
drivers/net/ethernet/intel/ice/ice_txrx_lib.h
··· 22 22 } 23 23 24 24 static inline __le64 25 - build_ctob(u64 td_cmd, u64 td_offset, unsigned int size, u64 td_tag) 25 + ice_build_ctob(u64 td_cmd, u64 td_offset, unsigned int size, u64 td_tag) 26 26 { 27 27 return cpu_to_le64(ICE_TX_DESC_DTYPE_DATA | 28 28 (td_cmd << ICE_TXD_QW1_CMD_S) |
+2 -2
drivers/net/ethernet/intel/ice/ice_xsk.c
··· 988 988 989 989 tx_desc = ICE_TX_DESC(xdp_ring, xdp_ring->next_to_use); 990 990 tx_desc->buf_addr = cpu_to_le64(dma); 991 - tx_desc->cmd_type_offset_bsz = build_ctob(ICE_TXD_LAST_DESC_CMD, 992 - 0, desc.len, 0); 991 + tx_desc->cmd_type_offset_bsz = 992 + ice_build_ctob(ICE_TXD_LAST_DESC_CMD, 0, desc.len, 0); 993 993 994 994 xdp_ring->next_to_use++; 995 995 if (xdp_ring->next_to_use == xdp_ring->count)