From ce5748d0f3797a67e92708a8fdff588bbc5eb286 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Sun, 20 Jun 2010 12:53:26 +0200 Subject: [PATCH 1/2] remove dead code --- drivers/char/agp/agp.h | 2 +- drivers/char/agp/intel-agp.c | 18 ------------------ 2 files changed, 1 insertions(+), 19 deletions(-) diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h index 870f12c..5672b20 100644 --- a/drivers/char/agp/agp.h +++ b/drivers/char/agp/agp.h @@ -91,7 +91,7 @@ struct aper_size_info_lvl2 { struct aper_size_info_fixed { int size; int num_entries; - int page_order; + int page_order; /* not actually used anywhere */ }; struct agp_bridge_driver { diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index 86e294d..41e662b 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c @@ -942,14 +942,8 @@ static void intel_i830_chipset_flush(struct agp_bridge_data *bridge) */ static int intel_i830_create_gatt_table(struct agp_bridge_data *bridge) { - int page_order; - struct aper_size_info_fixed *size; - int num_entries; u32 temp; - size = agp_bridge->current_size; - page_order = size->page_order; - num_entries = size->num_entries; agp_bridge->gatt_table_real = NULL; pci_read_config_dword(intel_private.pcidev, I810_MMADDR, &temp); @@ -1384,15 +1378,9 @@ static int intel_i9xx_fetch_size(void) */ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge) { - int page_order; - struct aper_size_info_fixed *size; - int num_entries; u32 temp, temp2; int gtt_map_size = 256 * 1024; - size = agp_bridge->current_size; - page_order = size->page_order; - num_entries = size->num_entries; agp_bridge->gatt_table_real = NULL; pci_read_config_dword(intel_private.pcidev, I915_MMADDR, &temp); @@ -1492,15 +1480,9 @@ static void intel_i965_get_gtt_range(int *gtt_offset, int *gtt_size) */ static int intel_i965_create_gatt_table(struct agp_bridge_data *bridge) { - int page_order; - struct aper_size_info_fixed *size; - int num_entries; u32 temp; int gtt_offset, gtt_size; - size = agp_bridge->current_size; - page_order = size->page_order; - num_entries = size->num_entries; agp_bridge->gatt_table_real = NULL; pci_read_config_dword(intel_private.pcidev, I915_MMADDR, &temp); -- 1.7.1.15.g43acf