Commit f938e97d authored by Dave Jones's avatar Dave Jones Committed by Dave Jones

indentation fixes.

parent eeed0d9f
...@@ -72,8 +72,7 @@ static int intel_i810_configure(void) ...@@ -72,8 +72,7 @@ static int intel_i810_configure(void)
pci_read_config_dword(intel_i810_private.i810_dev, I810_MMADDR, &temp); pci_read_config_dword(intel_i810_private.i810_dev, I810_MMADDR, &temp);
temp &= 0xfff80000; temp &= 0xfff80000;
intel_i810_private.registers = intel_i810_private.registers = (volatile u8 *) ioremap(temp, 128 * 4096);
(volatile u8 *) ioremap(temp, 128 * 4096);
if ((INREG32(intel_i810_private.registers, I810_DRAM_CTL) if ((INREG32(intel_i810_private.registers, I810_DRAM_CTL)
& I810_DRAM_ROW_0) == I810_DRAM_ROW_0_SDRAM) { & I810_DRAM_ROW_0) == I810_DRAM_ROW_0_SDRAM) {
...@@ -132,12 +131,10 @@ static int intel_i810_insert_entries(agp_memory * mem, off_t pg_start, ...@@ -132,12 +131,10 @@ static int intel_i810_insert_entries(agp_memory * mem, off_t pg_start,
} }
if (type != 0 || mem->type != 0) { if (type != 0 || mem->type != 0) {
if ((type == AGP_DCACHE_MEMORY) && if ((type == AGP_DCACHE_MEMORY) && (mem->type == AGP_DCACHE_MEMORY)) {
(mem->type == AGP_DCACHE_MEMORY)) {
/* special insert */ /* special insert */
CACHE_FLUSH(); CACHE_FLUSH();
for (i = pg_start; for (i = pg_start; i < (pg_start + mem->page_count); i++) {
i < (pg_start + mem->page_count); i++) {
OUTREG32(intel_i810_private.registers, OUTREG32(intel_i810_private.registers,
I810_PTE_BASE + (i * 4), I810_PTE_BASE + (i * 4),
(i * 4096) | I810_PTE_LOCAL | (i * 4096) | I810_PTE_LOCAL |
...@@ -147,10 +144,8 @@ static int intel_i810_insert_entries(agp_memory * mem, off_t pg_start, ...@@ -147,10 +144,8 @@ static int intel_i810_insert_entries(agp_memory * mem, off_t pg_start,
agp_bridge.tlb_flush(mem); agp_bridge.tlb_flush(mem);
return 0; return 0;
} }
if((type == AGP_PHYS_MEMORY) && if((type == AGP_PHYS_MEMORY) && (mem->type == AGP_PHYS_MEMORY))
(mem->type == AGP_PHYS_MEMORY)) {
goto insert; goto insert;
}
return -EINVAL; return -EINVAL;
} }
...@@ -209,14 +204,13 @@ static agp_memory *intel_i810_alloc_by_type(size_t pg_count, int type) ...@@ -209,14 +204,13 @@ static agp_memory *intel_i810_alloc_by_type(size_t pg_count, int type)
* Xserver still writes to it through the agp * Xserver still writes to it through the agp
* aperture * aperture
*/ */
if (pg_count != 1) { if (pg_count != 1)
return NULL; return NULL;
}
new = agp_create_memory(1);
if (new == NULL) { new = agp_create_memory(1);
if (new == NULL)
return NULL; return NULL;
}
MOD_INC_USE_COUNT; MOD_INC_USE_COUNT;
addr = agp_bridge.agp_alloc_page(); addr = agp_bridge.agp_alloc_page();
...@@ -232,7 +226,6 @@ static agp_memory *intel_i810_alloc_by_type(size_t pg_count, int type) ...@@ -232,7 +226,6 @@ static agp_memory *intel_i810_alloc_by_type(size_t pg_count, int type)
new->physical = virt_to_phys((void *) new->memory[0]); new->physical = virt_to_phys((void *) new->memory[0]);
return new; return new;
} }
return NULL; return NULL;
} }
...@@ -240,8 +233,7 @@ static void intel_i810_free_by_type(agp_memory * curr) ...@@ -240,8 +233,7 @@ static void intel_i810_free_by_type(agp_memory * curr)
{ {
agp_free_key(curr->key); agp_free_key(curr->key);
if(curr->type == AGP_PHYS_MEMORY) { if(curr->type == AGP_PHYS_MEMORY) {
agp_bridge.agp_destroy_page( agp_bridge.agp_destroy_page(phys_to_virt(curr->memory[0]));
phys_to_virt(curr->memory[0]));
vfree(curr->memory); vfree(curr->memory);
} }
kfree(curr); kfree(curr);
...@@ -581,8 +573,7 @@ static int intel_fetch_size(void) ...@@ -581,8 +573,7 @@ static int intel_fetch_size(void)
for (i = 0; i < agp_bridge.num_aperture_sizes; i++) { for (i = 0; i < agp_bridge.num_aperture_sizes; i++) {
if (temp == values[i].size_value) { if (temp == values[i].size_value) {
agp_bridge.previous_size = agp_bridge.previous_size = agp_bridge.current_size = (void *) (values + i);
agp_bridge.current_size = (void *) (values + i);
agp_bridge.aperture_size_idx = i; agp_bridge.aperture_size_idx = i;
return values[i].size; return values[i].size;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment