Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1c14cfbbe7a9f2240c73f420c3c6336fc521cd64
Commit: 1c14cfbbe7a9f2240c73f420c3c6336fc521cd64
Parent: 1eaf122cda2c135f90b9e610a847e6d4627b577c
Author: Andrew Morton <[EMAIL PROTECTED]>
AuthorDate: Mon Feb 5 16:09:35 2007 -0800
Committer: Dave Jones <[EMAIL PROTECTED]>
CommitDate: Sat Feb 10 19:56:36 2007 -0500
[AGPGART] allow drm populated agp memory types cleanups
Fix whitespace, braces, use kzalloc().
Cc: Dave Airlie <[EMAIL PROTECTED]>
Cc: Thomas Hellstrom <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Dave Jones <[EMAIL PROTECTED]>
---
drivers/char/agp/generic.c | 17 ++++-------------
drivers/char/agp/intel-agp.c | 1 -
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index a627b77..7923337 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -112,9 +112,8 @@ void agp_alloc_page_array(size_t size, struct agp_memory
*mem)
mem->memory = NULL;
mem->vmalloc_flag = 0;
- if (size <= 2*PAGE_SIZE) {
+ if (size <= 2*PAGE_SIZE)
mem->memory = kmalloc(size, GFP_KERNEL | __GFP_NORETRY);
- }
if (mem->memory == NULL) {
mem->memory = vmalloc(size);
mem->vmalloc_flag = 1;
@@ -138,12 +137,10 @@ static struct agp_memory *agp_create_user_memory(unsigned
long num_agp_pages)
struct agp_memory *new;
unsigned long alloc_size = num_agp_pages*sizeof(struct page *);
- new = kmalloc(sizeof(struct agp_memory), GFP_KERNEL);
-
+ new = kzalloc(sizeof(struct agp_memory), GFP_KERNEL);
if (new == NULL)
return NULL;
- memset(new, 0, sizeof(struct agp_memory));
new->key = agp_get_key();
if (new->key < 0) {
@@ -162,7 +159,6 @@ static struct agp_memory *agp_create_user_memory(unsigned
long num_agp_pages)
return new;
}
-
struct agp_memory *agp_create_memory(int scratch_pages)
{
struct agp_memory *new;
@@ -1071,9 +1067,8 @@ int agp_generic_insert_memory(struct agp_memory * mem,
off_t pg_start, int type)
num_entries -= agp_memory_reserved/PAGE_SIZE;
if (num_entries < 0) num_entries = 0;
- if (type != mem->type) {
+ if (type != mem->type)
return -EINVAL;
- }
mask_type = bridge->driver->agp_type_to_mask_type(bridge, type);
if (mask_type != 0) {
@@ -1143,14 +1138,12 @@ int agp_generic_remove_memory(struct agp_memory *mem,
off_t pg_start, int type)
}
EXPORT_SYMBOL(agp_generic_remove_memory);
-
struct agp_memory *agp_generic_alloc_by_type(size_t page_count, int type)
{
return NULL;
}
EXPORT_SYMBOL(agp_generic_alloc_by_type);
-
void agp_generic_free_by_type(struct agp_memory *curr)
{
agp_free_page_array(curr);
@@ -1170,9 +1163,8 @@ struct agp_memory *agp_generic_alloc_user(size_t
page_count, int type)
if (new == NULL)
return NULL;
- for (i = 0; i < page_count; i++) {
+ for (i = 0; i < page_count; i++)
new->memory[i] = 0;
- }
new->page_count = 0;
new->type = type;
new->num_scratch_pages = pages;
@@ -1181,7 +1173,6 @@ struct agp_memory *agp_generic_alloc_user(size_t
page_count, int type)
}
EXPORT_SYMBOL(agp_generic_alloc_user);
-
/*
* Basic Page Allocation Routines -
* These routines handle page allocation and by default they reserve the
allocated
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 6b9fb21..06b0bb6 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -89,7 +89,6 @@ static struct _intel_i810_private {
int num_dcache_entries;
} intel_i810_private;
-
static int intel_i810_fetch_size(void)
{
u32 smram_miscc;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
