patch-2.3.46 linux/drivers/char/zr36120_mem.c

• Lines: 36
• Date: Mon Feb 14 15:34:21 2000
• Orig file: v2.3.45/linux/drivers/char/zr36120_mem.c
• Orig date: Tue Jan 4 13:57:17 2000

diff -u --recursive --new-file v2.3.45/linux/drivers/char/zr36120_mem.c linux/drivers/char/zr36120_mem.c
@@ -35,17 +35,6 @@
 /* Memory management functions */
 /*******************************/
 
-inline int __get_order(unsigned long size)
-{
-        int order = 0;
-	size = (size+PAGE_SIZE-1)/PAGE_SIZE;
-	while (size) {
-		size /= 2;
-		order++;
-	}
-	return order;
-}
-			
 void* bmalloc(unsigned long size)
 {
 	void* mem;
@@ -56,7 +45,7 @@
 	 * The following function got a lot of memory at boottime,
 	 * so we know its always there...
 	 */
-	mem = (void*)__get_free_pages(GFP_USER|GFP_DMA,__get_order(size));
+	mem = (void*)__get_free_pages(GFP_USER|GFP_DMA,get_order(size));
 #endif
 	if (mem) {
 		unsigned long adr = (unsigned long)mem;
@@ -82,7 +71,7 @@
 #ifdef CONFIG_BIGPHYS_AREA
 		bigphysarea_free_pages(mem);
 #else
-		free_pages((unsigned long)mem,__get_order(size));
+		free_pages((unsigned long)mem,get_order(size));
 #endif
 	}
 }