X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fchar%2Fagp%2Falpha-agp.c;h=a072d32005a466431c5bfed2c421e3ee27837cf1;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=2b5838e64751a3bc3cb0ba005deba67b88cbfdc9;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git diff --git a/drivers/char/agp/alpha-agp.c b/drivers/char/agp/alpha-agp.c index 2b5838e64..a072d3200 100644 --- a/drivers/char/agp/alpha-agp.c +++ b/drivers/char/agp/alpha-agp.c @@ -23,9 +23,8 @@ static struct page *alpha_core_agp_vm_nopage(struct vm_area_struct *vma, dma_addr = address - vma->vm_start + agp->aperture.bus_base; pa = agp->ops->translate(agp, dma_addr); - if (pa == (unsigned long)-EINVAL) - return NULL; /* no translation */ - + if (pa == (unsigned long)-EINVAL) return NULL; /* no translation */ + /* * Get the page, inc the use count, and return it */ @@ -90,7 +89,7 @@ static void alpha_core_agp_enable(struct agp_bridge_data *bridge, u32 mode) agp_device_command(agp->mode.lw, 0); } -static int alpha_core_agp_insert_memory(struct agp_memory *mem, off_t pg_start, +static int alpha_core_agp_insert_memory(struct agp_memory *mem, off_t pg_start, int type) { alpha_agp_info *agp = agp_bridge->dev_private_data; @@ -99,8 +98,7 @@ static int alpha_core_agp_insert_memory(struct agp_memory *mem, off_t pg_start, temp = agp_bridge->current_size; num_entries = A_SIZE_FIX(temp)->num_entries; - if ((pg_start + mem->page_count) > num_entries) - return -EINVAL; + if ((pg_start + mem->page_count) > num_entries) return -EINVAL; status = agp->ops->bind(agp, pg_start, mem); mb(); @@ -109,7 +107,7 @@ static int alpha_core_agp_insert_memory(struct agp_memory *mem, off_t pg_start, return status; } -static int alpha_core_agp_remove_memory(struct agp_memory *mem, off_t pg_start, +static int alpha_core_agp_remove_memory(struct agp_memory *mem, off_t pg_start, int type) { alpha_agp_info *agp = agp_bridge->dev_private_data; @@ -127,7 +125,7 @@ struct agp_bridge_driver alpha_core_agp_driver = { .size_type = FIXED_APER_SIZE, .cant_use_aperture = 1, .masks = NULL, - + .fetch_size = alpha_core_agp_fetch_size, .configure = alpha_core_agp_configure, .agp_enable = alpha_core_agp_enable,