treewide: use kv[mz]alloc* rather than opencoded variants

[sfrench/cifs-2.6.git] / drivers / char / agp / generic.c

diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index f002fa5d1887a0b183b2532891fd853c2587f239..bdf418cac8efd80a91214db24f857b61cedebd4d 100644 (file)
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -88,13 +88,7 @@ static int agp_get_key(void)
 
 void agp_alloc_page_array(size_t size, struct agp_memory *mem)
 {
-       mem->pages = NULL;
-
-       if (size <= 2*PAGE_SIZE)
-               mem->pages = kmalloc(size, GFP_KERNEL | __GFP_NOWARN);
-       if (mem->pages == NULL) {
-               mem->pages = vmalloc(size);
-       }
+       mem->pages = kvmalloc(size, GFP_KERNEL);
 }
 EXPORT_SYMBOL(agp_alloc_page_array);