Skip to content

Commit 5757cc7

Browse files
anguy11Jeff Kirsher
authored andcommitted
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 <[email protected]> Tested-by: Andrew Bowers <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]>
1 parent c522d1f commit 5757cc7

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

drivers/net/ethernet/intel/ice/ice_txrx.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1680,7 +1680,8 @@ ice_tx_map(struct ice_ring *tx_ring, struct ice_tx_buf *first,
16801680
*/
16811681
while (unlikely(size > ICE_MAX_DATA_PER_TXD)) {
16821682
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);
16841685

16851686
tx_desc++;
16861687
i++;
@@ -1700,8 +1701,8 @@ ice_tx_map(struct ice_ring *tx_ring, struct ice_tx_buf *first,
17001701
if (likely(!data_len))
17011702
break;
17021703

1703-
tx_desc->cmd_type_offset_bsz = build_ctob(td_cmd, td_offset,
1704-
size, td_tag);
1704+
tx_desc->cmd_type_offset_bsz = ice_build_ctob(td_cmd, td_offset,
1705+
size, td_tag);
17051706

17061707
tx_desc++;
17071708
i++;
@@ -1732,8 +1733,8 @@ ice_tx_map(struct ice_ring *tx_ring, struct ice_tx_buf *first,
17321733

17331734
/* write last descriptor with RS and EOP bits */
17341735
td_cmd |= (u64)ICE_TXD_LAST_DESC_CMD;
1735-
tx_desc->cmd_type_offset_bsz = build_ctob(td_cmd, td_offset, size,
1736-
td_tag);
1736+
tx_desc->cmd_type_offset_bsz =
1737+
ice_build_ctob(td_cmd, td_offset, size, td_tag);
17371738

17381739
/* Force memory writes to complete before letting h/w know there
17391740
* are new descriptors to fetch.

drivers/net/ethernet/intel/ice/ice_txrx_lib.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ int ice_xmit_xdp_ring(void *data, u16 size, struct ice_ring *xdp_ring)
232232

233233
tx_desc = ICE_TX_DESC(xdp_ring, i);
234234
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);
237237

238238
/* Make certain all of the status bits have been updated
239239
* before next_to_watch is written.

drivers/net/ethernet/intel/ice/ice_txrx_lib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ice_test_staterr(union ice_32b_rx_flex_desc *rx_desc, const u16 stat_err_bits)
2222
}
2323

2424
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)
2626
{
2727
return cpu_to_le64(ICE_TX_DESC_DTYPE_DATA |
2828
(td_cmd << ICE_TXD_QW1_CMD_S) |

drivers/net/ethernet/intel/ice/ice_xsk.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -988,8 +988,8 @@ static bool ice_xmit_zc(struct ice_ring *xdp_ring, int budget)
988988

989989
tx_desc = ICE_TX_DESC(xdp_ring, xdp_ring->next_to_use);
990990
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);
993993

994994
xdp_ring->next_to_use++;
995995
if (xdp_ring->next_to_use == xdp_ring->count)

0 commit comments

Comments
 (0)