staging/lustre: Use roundup_pow_of_two() in LNetEQAlloc()

Use roundup_pow_of_two() and drop the private cfs_power2_roundup()
implementation.

Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
index fef882530455f2b4f6c8c57daf8f66638f68a0ad..d8f8543de5732946b568a81be0b9b5aa6ed475ec 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
@@ -496,19 +496,6 @@ static inline size_t cfs_round_strlen(char *fset)
        return (size_t)cfs_size_round((int)strlen(fset) + 1);
 }
 
-/* roundup \a val to power2 */
-static inline unsigned int cfs_power2_roundup(unsigned int val)
-{
-       if (val != LOWEST_BIT_SET(val)) { /* not a power of 2 already */
-               do {
-                       val &= ~LOWEST_BIT_SET(val);
-               } while (val != LOWEST_BIT_SET(val));
-               /* ...and round up */
-               val <<= 1;
-       }
-       return val;
-}
-
 #define LOGL(var, len, ptr)                                   \
 do {                                                       \
        if (var)                                                \

diff --git a/drivers/staging/lustre/lnet/lnet/lib-eq.c b/drivers/staging/lustre/lnet/lnet/lib-eq.c
index 5470148f5b64a235fa9c6d35ebca7542cc1a658d..1221c0bad1072ae5e17dba323f36cd89b64bb1a8 100644 (file)
--- a/drivers/staging/lustre/lnet/lnet/lib-eq.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-eq.c
@@ -79,7 +79,7 @@ LNetEQAlloc(unsigned int count, lnet_eq_handler_t callback,
         * overflow, they don't skip entries, so the queue has the same
         * apparent capacity at all times */
 
-       count = cfs_power2_roundup(count);
+       count = roundup_pow_of_two(count);
 
        if (callback != LNET_EQ_HANDLER_NONE && count != 0)
                CWARN("EQ callback is guaranteed to get every event, do you still want to set eqcount %d for polling event which will have locking overhead? Please contact with developer to confirm\n", count);