From: Pekka Enberg <penberg@kernel.org>
Date: Fri, 15 May 2015 18:40:19 +0000 (+0300)
Subject: staging/lustre: Remove duplicate helpers from libcfs.h
X-Git-Tag: v4.2-rc1~88^2~570
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=36fc24486910d492881f279cb97ad33b69859ebd;p=karo-tx-linux.git

staging/lustre: Remove duplicate helpers from libcfs.h

Remove bunch of duplicate helpers from libcfs.h that are guaranteed to
be present.

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.h b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
index 244f1aaecad2..a789559b81c2 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
@@ -42,25 +42,6 @@
 
 #include "curproc.h"
 
-#ifndef offsetof
-# define offsetof(typ, memb) ((long)(long_ptr_t)((char *)&(((typ *)0)->memb)))
-#endif
-
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(a) ((sizeof(a)) / (sizeof((a)[0])))
-#endif
-
-#if !defined(swap)
-#define swap(x, y) do { typeof(x) z = x; x = y; y = z; } while (0)
-#endif
-
-#if !defined(container_of)
-/* given a pointer @ptr to the field @member embedded into type (usually
- * struct) @type, return pointer to the embedding instance of @type. */
-#define container_of(ptr, type, member) \
-	((type *)((char *)(ptr)-(char *)(&((type *)0)->member)))
-#endif
-
 static inline int __is_po2(unsigned long long val)
 {
 	return !(val & (val - 1));