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>

diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c
index 05d1077f80c32208ef36f895da514aee14adf0ec..0d90e32efab925babdf156c7a4ba90a1f5ff99bc 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_txrx.c
+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c
@@ -1680,7 +1680,8 @@ ice_tx_map(struct ice_ring *tx_ring, struct ice_tx_buf *first,
                 */
                while (unlikely(size > ICE_MAX_DATA_PER_TXD)) {
                        tx_desc->cmd_type_offset_bsz =
-                               build_ctob(td_cmd, td_offset, max_data, td_tag);
+                               ice_build_ctob(td_cmd, td_offset, max_data,
+                                              td_tag);
 
                        tx_desc++;
                        i++;
@@ -1700,8 +1701,8 @@ ice_tx_map(struct ice_ring *tx_ring, struct ice_tx_buf *first,
                if (likely(!data_len))
                        break;
 
-               tx_desc->cmd_type_offset_bsz = build_ctob(td_cmd, td_offset,
-                                                         size, td_tag);
+               tx_desc->cmd_type_offset_bsz = ice_build_ctob(td_cmd, td_offset,
+                                                             size, td_tag);
 
                tx_desc++;
                i++;
@@ -1732,8 +1733,8 @@ ice_tx_map(struct ice_ring *tx_ring, struct ice_tx_buf *first,
 
        /* write last descriptor with RS and EOP bits */
        td_cmd |= (u64)ICE_TXD_LAST_DESC_CMD;
-       tx_desc->cmd_type_offset_bsz = build_ctob(td_cmd, td_offset, size,
-                                                 td_tag);
+       tx_desc->cmd_type_offset_bsz =
+                       ice_build_ctob(td_cmd, td_offset, size, td_tag);
 
        /* Force memory writes to complete before letting h/w know there
         * are new descriptors to fetch.

diff --git a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
index 9d6512f96b8c186803b0a3e91bfb9d8c04fcc020..1ba97172d8d0770b5a4f4a124b7d5819227a8705 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
@@ -232,8 +232,8 @@ int ice_xmit_xdp_ring(void *data, u16 size, struct ice_ring *xdp_ring)
 
        tx_desc = ICE_TX_DESC(xdp_ring, i);
        tx_desc->buf_addr = cpu_to_le64(dma);
-       tx_desc->cmd_type_offset_bsz = build_ctob(ICE_TXD_LAST_DESC_CMD, 0,
-                                                 size, 0);
+       tx_desc->cmd_type_offset_bsz = ice_build_ctob(ICE_TXD_LAST_DESC_CMD, 0,
+                                                     size, 0);
 
        /* Make certain all of the status bits have been updated
         * before next_to_watch is written.

diff --git a/drivers/net/ethernet/intel/ice/ice_txrx_lib.h b/drivers/net/ethernet/intel/ice/ice_txrx_lib.h
index af0fca5b91ffcab6933a62b062e963f9c6e2408e..58ff58f0f9720f58d8ea3da75168a0d207f054a8 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_txrx_lib.h
+++ b/drivers/net/ethernet/intel/ice/ice_txrx_lib.h
@@ -22,7 +22,7 @@ ice_test_staterr(union ice_32b_rx_flex_desc *rx_desc, const u16 stat_err_bits)
 }
 
 static inline __le64
-build_ctob(u64 td_cmd, u64 td_offset, unsigned int size, u64 td_tag)
+ice_build_ctob(u64 td_cmd, u64 td_offset, unsigned int size, u64 td_tag)
 {
        return cpu_to_le64(ICE_TX_DESC_DTYPE_DATA |
                           (td_cmd    << ICE_TXD_QW1_CMD_S) |

diff --git a/drivers/net/ethernet/intel/ice/ice_xsk.c b/drivers/net/ethernet/intel/ice/ice_xsk.c
index 23e5515d45277f88b72f553bcda21e851268508e..20ac54e3156dcc4d72765004617c8ddc6b0cc57f 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_xsk.c
+++ b/drivers/net/ethernet/intel/ice/ice_xsk.c
@@ -988,8 +988,8 @@ static bool ice_xmit_zc(struct ice_ring *xdp_ring, int budget)
 
                tx_desc = ICE_TX_DESC(xdp_ring, xdp_ring->next_to_use);
                tx_desc->buf_addr = cpu_to_le64(dma);
-               tx_desc->cmd_type_offset_bsz = build_ctob(ICE_TXD_LAST_DESC_CMD,
-                                                         0, desc.len, 0);
+               tx_desc->cmd_type_offset_bsz =
+                       ice_build_ctob(ICE_TXD_LAST_DESC_CMD, 0, desc.len, 0);
 
                xdp_ring->next_to_use++;
                if (xdp_ring->next_to_use == xdp_ring->count)