Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / char / agp / alpha-agp.c

diff --git a/drivers/char/agp/alpha-agp.c b/drivers/char/agp/alpha-agp.c
index a072d32..2b5838e 100644 (file)
--- a/drivers/char/agp/alpha-agp.c
+++ b/drivers/char/agp/alpha-agp.c
@@ -23,8 +23,9 @@ 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
         */
@@ -89,7 +90,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;
@@ -98,7 +99,8 @@ 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();
@@ -107,7 +109,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;
@@ -125,7 +127,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,