1 files changed, 11 insertions, 28 deletions

diff --git a/include/linux/genalloc.h b/include/linux/genalloc.h
index dd7c569aaca..ae9daa29395 100644
--- a/include/linux/genalloc.h
+++ b/include/linux/genalloc.h
@@ -29,20 +29,6 @@
 
 #ifndef __GENALLOC_H__
 #define __GENALLOC_H__
-/**
- * Allocation callback function type definition
- * @map: Pointer to bitmap
- * @size: The bitmap size in bits
- * @start: The bitnumber to start searching at
- * @nr: The number of zeroed bits we're looking for
- * @data: optional additional data used by @genpool_algo_t
- */
-typedef unsigned long (*genpool_algo_t)(unsigned long *map,
-                        unsigned long size,
-                        unsigned long start,
-                        unsigned int nr,
-                        void *data);
-
 /*
  *  General purpose special memory pool descriptor.
  */
@@ -50,9 +36,6 @@ struct gen_pool {
         spinlock_t lock;
         struct list_head chunks;        /* list of chunks in this pool */
         int min_alloc_order;            /* minimum allocation order */
-
-        genpool_algo_t algo;            /* allocation function */
-        void *data;
 };
 
 /*
@@ -89,20 +72,20 @@ static inline int gen_pool_add(struct gen_pool *pool, unsigned long addr,
         return gen_pool_add_virt(pool, addr, -1, size, nid);
 }
 extern void gen_pool_destroy(struct gen_pool *);
-extern unsigned long gen_pool_alloc(struct gen_pool *, size_t);
+extern unsigned long gen_pool_alloc_addr(struct gen_pool *,
+        size_t, unsigned long);
+/**
+ * gen_pool_alloc - allocate special memory from the pool
+ * @pool: pool to allocate from
+ * @size: number of bytes to allocate from the pool
+ */
+static inline unsigned long gen_pool_alloc(struct gen_pool *pool, size_t size)
+{
+        return gen_pool_alloc_addr(pool, size, 0);
+}
 extern void gen_pool_free(struct gen_pool *, unsigned long, size_t);
 extern void gen_pool_for_each_chunk(struct gen_pool *,
         void (*)(struct gen_pool *, struct gen_pool_chunk *, void *), void *);
 extern size_t gen_pool_avail(struct gen_pool *);
 extern size_t gen_pool_size(struct gen_pool *);
-
-extern void gen_pool_set_algo(struct gen_pool *pool, genpool_algo_t algo,
-                void *data);
-
-extern unsigned long gen_pool_first_fit(unsigned long *map, unsigned long size,
-                unsigned long start, unsigned int nr, void *data);
-
-extern unsigned long gen_pool_best_fit(unsigned long *map, unsigned long size,
-                unsigned long start, unsigned int nr, void *data);
-
 #endif /* __GENALLOC_H__ */