octeontx2-af: Remove redundant functions rvu_npc_exact_mac2u64()

The rvu_npc_exact_mac2u64() is used to convert an Ethernet MAC address
into a u64 value, as this is exactly what ether_addr_to_u64() does.
Use ether_addr_to_u64() to replace the rvu_npc_exact_mac2u64().

Signed-off-by: Li Zetao <lizetao1@huawei.com>
Acked-by: Geethasowjanya Akula <gakula@marvell.com>
Link: https://lore.kernel.org/r/20230808114504.4036008-4-lizetao1@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
index 7e20282c12d00b3fac4e1915ab1c5c24a2bfcb09..d2661e7fabdb498b82e63c1cd4ac8c3f452b25ca 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
@@ -390,22 +390,6 @@ int rvu_mbox_handler_npc_get_field_hash_info(struct rvu *rvu,
        return 0;
 }
 
-/**
- *     rvu_npc_exact_mac2u64 - utility function to convert mac address to u64.
- *     @mac_addr: MAC address.
- *     Return: mdata for exact match table.
- */
-static u64 rvu_npc_exact_mac2u64(u8 *mac_addr)
-{
-       u64 mac = 0;
-       int index;
-
-       for (index = ETH_ALEN - 1; index >= 0; index--)
-               mac |= ((u64)*mac_addr++) << (8 * index);
-
-       return mac;
-}
-
 /**
  *     rvu_exact_prepare_mdata - Make mdata for mcam entry
  *     @mac: MAC address
@@ -416,7 +400,7 @@ static u64 rvu_npc_exact_mac2u64(u8 *mac_addr)
  */
 static u64 rvu_exact_prepare_mdata(u8 *mac, u16 chan, u16 ctype, u64 mask)
 {
-       u64 ldata = rvu_npc_exact_mac2u64(mac);
+       u64 ldata = ether_addr_to_u64(mac);
 
        /* Please note that mask is 48bit which excludes chan and ctype.
         * Increase mask bits if we need to include them as well.
@@ -604,7 +588,7 @@ static u64 rvu_exact_prepare_table_entry(struct rvu *rvu, bool enable,
                                         u8 ctype, u16 chan, u8 *mac_addr)
 
 {
-       u64 ldata = rvu_npc_exact_mac2u64(mac_addr);
+       u64 ldata = ether_addr_to_u64(mac_addr);
 
        /* Enable or disable */
        u64 mdata = FIELD_PREP(GENMASK_ULL(63, 63), enable ? 1 : 0);