firewire: fw-sbp2: correctly align page tables

[safe/jmp/linux-2.6] / drivers / firewire / fw-iso.c

diff --git a/drivers/firewire/fw-iso.c b/drivers/firewire/fw-iso.c
index 728cbb3..2b640e9 100644 (file)
--- a/drivers/firewire/fw-iso.c
+++ b/drivers/firewire/fw-iso.c
@@ -1,6 +1,6 @@
-/*                                             -*- c-basic-offset: 8 -*-
+/*
+ * Isochronous IO functionality
  *
- * fw-iso.c - Isochronous IO
  * Copyright (C) 2006 Kristian Hoegsberg <krh@bitplanet.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -47,7 +47,7 @@ fw_iso_buffer_init(struct fw_iso_buffer *buffer, struct fw_card *card,
                buffer->pages[i] = alloc_page(GFP_KERNEL | GFP_DMA32 | __GFP_ZERO);
                if (buffer->pages[i] == NULL)
                        goto out_pages;
-               
+
                address = dma_map_page(card->device, buffer->pages[i],
                                       0, PAGE_SIZE, direction);
                if (dma_mapping_error(address)) {
@@ -107,14 +107,12 @@ void fw_iso_buffer_destroy(struct fw_iso_buffer *buffer,
 
 struct fw_iso_context *
 fw_iso_context_create(struct fw_card *card, int type,
-                     int channel, int speed,
-                     int sync, int tags, size_t header_size,
+                     int channel, int speed, size_t header_size,
                      fw_iso_callback_t callback, void *callback_data)
 {
        struct fw_iso_context *ctx;
 
-       ctx = card->driver->allocate_iso_context(card, type,
-                                                sync, tags, header_size);
+       ctx = card->driver->allocate_iso_context(card, type, header_size);
        if (IS_ERR(ctx))
                return ctx;
 
@@ -122,8 +120,6 @@ fw_iso_context_create(struct fw_card *card, int type,
        ctx->type = type;
        ctx->channel = channel;
        ctx->speed = speed;
-       ctx->sync = sync;
-       ctx->tags = tags;
        ctx->header_size = header_size;
        ctx->callback = callback;
        ctx->callback_data = callback_data;
@@ -141,9 +137,9 @@ void fw_iso_context_destroy(struct fw_iso_context *ctx)
 EXPORT_SYMBOL(fw_iso_context_destroy);
 
 int
-fw_iso_context_start(struct fw_iso_context *ctx, int cycle)
+fw_iso_context_start(struct fw_iso_context *ctx, int cycle, int sync, int tags)
 {
-       return ctx->card->driver->start_iso(ctx, cycle);
+       return ctx->card->driver->start_iso(ctx, cycle, sync, tags);
 }
 EXPORT_SYMBOL(fw_iso_context_start);