remove extra parentheses in return statement

[dpdk.git] / lib / librte_hash / rte_cuckoo_hash.c

diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c
index e6520dd..71b5b76 100644 (file)
--- a/lib/librte_hash/rte_cuckoo_hash.c
+++ b/lib/librte_hash/rte_cuckoo_hash.c
@@ -85,7 +85,7 @@ EAL_REGISTER_TAILQ(rte_hash_tailq)
 #endif
 
 /* Hash function used if none is specified */
-#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
+#if defined(RTE_MACHINE_CPUFLAG_SSE4_2) || defined(RTE_MACHINE_CPUFLAG_CRC32)
 #include <rte_hash_crc.h>
 #define DEFAULT_HASH_FUNC       rte_hash_crc
 #else
@@ -102,8 +102,6 @@ EAL_REGISTER_TAILQ(rte_hash_tailq)
 
 #define LCORE_CACHE_SIZE               8
 
-typedef int (*rte_hash_cmp_eq_t)(const void *key1, const void *key2, size_t key_len);
-
 struct lcore_cache {
        unsigned len; /**< Cache len */
        void *objs[LCORE_CACHE_SIZE]; /**< Cache objects */
@@ -187,6 +185,11 @@ rte_hash_find_existing(const char *name)
        return h;
 }
 
+void rte_hash_set_cmp_func(struct rte_hash *h, rte_hash_cmp_eq_t func)
+{
+       h->rte_hash_cmp_eq = func;
+}
+
 struct rte_hash *
 rte_hash_create(const struct rte_hash_parameters *params)
 {
@@ -422,7 +425,7 @@ rte_hash_secondary_hash(const hash_sig_t primary_hash)
 
        uint32_t tag = primary_hash >> all_bits_shift;
 
-       return (primary_hash ^ ((tag + 1) * alt_bits_xor));
+       return primary_hash ^ ((tag + 1) * alt_bits_xor);
 }
 
 void
@@ -600,7 +603,7 @@ __rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key,
                                 * Return index where key is stored,
                                 * substracting the first dummy index
                                 */
-                               return (prim_bkt->key_idx[i] - 1);
+                               return prim_bkt->key_idx[i] - 1;
                        }
                }
        }
@@ -620,7 +623,7 @@ __rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key,
                                 * Return index where key is stored,
                                 * substracting the first dummy index
                                 */
-                               return (sec_bkt->key_idx[i] - 1);
+                               return sec_bkt->key_idx[i] - 1;
                        }
                }
        }
@@ -652,7 +655,7 @@ __rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key,
                prim_bkt->signatures[ret].current = sig;
                prim_bkt->signatures[ret].alt = alt_hash;
                prim_bkt->key_idx[ret] = new_idx;
-               return (new_idx - 1);
+               return new_idx - 1;
        }
 
        /* Error in addition, store new slot back in the ring and return error */
@@ -729,7 +732,7 @@ __rte_hash_lookup_with_hash(const struct rte_hash *h, const void *key,
                                 * Return index where key is stored,
                                 * substracting the first dummy index
                                 */
-                               return (bkt->key_idx[i] - 1);
+                               return bkt->key_idx[i] - 1;
                        }
                }
        }
@@ -752,7 +755,7 @@ __rte_hash_lookup_with_hash(const struct rte_hash *h, const void *key,
                                 * Return index where key is stored,
                                 * substracting the first dummy index
                                 */
-                               return (bkt->key_idx[i] - 1);
+                               return bkt->key_idx[i] - 1;
                        }
                }
        }
@@ -844,7 +847,7 @@ __rte_hash_del_key_with_hash(const struct rte_hash *h, const void *key,
                                 * Return index where key is stored,
                                 * substracting the first dummy index
                                 */
-                               return (bkt->key_idx[i] - 1);
+                               return bkt->key_idx[i] - 1;
                        }
                }
        }
@@ -867,7 +870,7 @@ __rte_hash_del_key_with_hash(const struct rte_hash *h, const void *key,
                                 * Return index where key is stored,
                                 * substracting the first dummy index
                                 */
-                               return (bkt->key_idx[i] - 1);
+                               return bkt->key_idx[i] - 1;
                        }
                }
        }
@@ -1236,5 +1239,5 @@ rte_hash_iterate(const struct rte_hash *h, const void **key, void **data, uint32
        /* Increment iterator */
        (*next)++;
 
-       return (position - 1);
+       return position - 1;
 }