diff options
-rw-r--r-- | drivers/char/agp/agp.h | 3 | ||||
-rw-r--r-- | drivers/char/agp/generic.c | 8 |
2 files changed, 0 insertions, 11 deletions
diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h index 04ad0bbfaf41..5259065f3c79 100644 --- a/drivers/char/agp/agp.h +++ b/drivers/char/agp/agp.h | |||
@@ -121,9 +121,6 @@ struct agp_bridge_driver { | |||
121 | void (*agp_destroy_pages)(struct agp_memory *); | 121 | void (*agp_destroy_pages)(struct agp_memory *); |
122 | int (*agp_type_to_mask_type) (struct agp_bridge_data *, int); | 122 | int (*agp_type_to_mask_type) (struct agp_bridge_data *, int); |
123 | void (*chipset_flush)(struct agp_bridge_data *); | 123 | void (*chipset_flush)(struct agp_bridge_data *); |
124 | |||
125 | int (*agp_map_memory)(struct agp_memory *mem); | ||
126 | void (*agp_unmap_memory)(struct agp_memory *mem); | ||
127 | }; | 124 | }; |
128 | 125 | ||
129 | struct agp_bridge_data { | 126 | struct agp_bridge_data { |
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c index d2abf5143983..78235ceccfa1 100644 --- a/drivers/char/agp/generic.c +++ b/drivers/char/agp/generic.c | |||
@@ -437,11 +437,6 @@ int agp_bind_memory(struct agp_memory *curr, off_t pg_start) | |||
437 | curr->is_flushed = true; | 437 | curr->is_flushed = true; |
438 | } | 438 | } |
439 | 439 | ||
440 | if (curr->bridge->driver->agp_map_memory) { | ||
441 | ret_val = curr->bridge->driver->agp_map_memory(curr); | ||
442 | if (ret_val) | ||
443 | return ret_val; | ||
444 | } | ||
445 | ret_val = curr->bridge->driver->insert_memory(curr, pg_start, curr->type); | 440 | ret_val = curr->bridge->driver->insert_memory(curr, pg_start, curr->type); |
446 | 441 | ||
447 | if (ret_val != 0) | 442 | if (ret_val != 0) |
@@ -483,9 +478,6 @@ int agp_unbind_memory(struct agp_memory *curr) | |||
483 | if (ret_val != 0) | 478 | if (ret_val != 0) |
484 | return ret_val; | 479 | return ret_val; |
485 | 480 | ||
486 | if (curr->bridge->driver->agp_unmap_memory) | ||
487 | curr->bridge->driver->agp_unmap_memory(curr); | ||
488 | |||
489 | curr->is_bound = false; | 481 | curr->is_bound = false; |
490 | curr->pg_start = 0; | 482 | curr->pg_start = 0; |
491 | spin_lock(&curr->bridge->mapped_lock); | 483 | spin_lock(&curr->bridge->mapped_lock); |