Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (23 commits)
  firewire: ohci: extend initialization log message
  firewire: ohci: fix IR/IT context mask mixup
  firewire: ohci: add module parameter to activate quirk fixes
  firewire: ohci: use an ID table for quirks detection
  firewire: ohci: reorder struct fw_ohci for better cache efficiency
  firewire: ohci: remove unused dualbuffer IR code
  firewire: core: combine a bit of repeated code
  firewire: core: change type of a data buffer
  firewire: cdev: increment ABI version number
  firewire: cdev: add more flexible cycle timer ioctl
  firewire: core: rename an internal function
  firewire: core: fix an information leak
  firewire: core: increase stack size of config ROM reader
  firewire: core: don't fail device creation in case of too large config ROM blocks
  firewire: core: fix "giving up on config rom" with Panasonic AG-DV2500
  firewire: remove incomplete Bus_Time CSR support
  firewire: get_cycle_timer optimization and cleanup
  firewire: ohci: enable cycle timer fix on ALi and NEC controllers
  firewire: ohci: work around cycle timer bugs on VIA controllers
  firewire: make PCI device id constant
  ...

6 files changed, 447 insertions, 507 deletions

diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index 4eeaed57e219..8be720b278b7 100644
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -25,6 +25,7 @@
 #include <linux/firewire.h>
 #include <linux/firewire-cdev.h>
 #include <linux/idr.h>
+#include <linux/irqflags.h>
 #include <linux/jiffies.h>
 #include <linux/kernel.h>
 #include <linux/kref.h>
@@ -32,7 +33,6 @@
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/poll.h>
-#include <linux/preempt.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/string.h>
@@ -368,39 +368,56 @@ void fw_device_cdev_remove(struct fw_device *device)
         for_each_client(device, wake_up_client);
 }
 
-static int ioctl_get_info(struct client *client, void *buffer)
+union ioctl_arg {
+        struct fw_cdev_get_info                 get_info;
+        struct fw_cdev_send_request             send_request;
+        struct fw_cdev_allocate                 allocate;
+        struct fw_cdev_deallocate               deallocate;
+        struct fw_cdev_send_response            send_response;
+        struct fw_cdev_initiate_bus_reset       initiate_bus_reset;
+        struct fw_cdev_add_descriptor           add_descriptor;
+        struct fw_cdev_remove_descriptor        remove_descriptor;
+        struct fw_cdev_create_iso_context       create_iso_context;
+        struct fw_cdev_queue_iso                queue_iso;
+        struct fw_cdev_start_iso                start_iso;
+        struct fw_cdev_stop_iso                 stop_iso;
+        struct fw_cdev_get_cycle_timer          get_cycle_timer;
+        struct fw_cdev_allocate_iso_resource    allocate_iso_resource;
+        struct fw_cdev_send_stream_packet       send_stream_packet;
+        struct fw_cdev_get_cycle_timer2         get_cycle_timer2;
+};
+
+static int ioctl_get_info(struct client *client, union ioctl_arg *arg)
 {
-        struct fw_cdev_get_info *get_info = buffer;
+        struct fw_cdev_get_info *a = &arg->get_info;
         struct fw_cdev_event_bus_reset bus_reset;
         unsigned long ret = 0;
 
-        client->version = get_info->version;
-        get_info->version = FW_CDEV_VERSION;
-        get_info->card = client->device->card->index;
+        client->version = a->version;
+        a->version = FW_CDEV_VERSION;
+        a->card = client->device->card->index;
 
         down_read(&fw_device_rwsem);
 
-        if (get_info->rom != 0) {
-                void __user *uptr = u64_to_uptr(get_info->rom);
-                size_t want = get_info->rom_length;
+        if (a->rom != 0) {
+                size_t want = a->rom_length;
                 size_t have = client->device->config_rom_length * 4;
 
-                ret = copy_to_user(uptr, client->device->config_rom,
-                                   min(want, have));
+                ret = copy_to_user(u64_to_uptr(a->rom),
+                                   client->device->config_rom, min(want, have));
         }
-        get_info->rom_length = client->device->config_rom_length * 4;
+        a->rom_length = client->device->config_rom_length * 4;
 
         up_read(&fw_device_rwsem);
 
         if (ret != 0)
                 return -EFAULT;
 
-        client->bus_reset_closure = get_info->bus_reset_closure;
-        if (get_info->bus_reset != 0) {
-                void __user *uptr = u64_to_uptr(get_info->bus_reset);
-
+        client->bus_reset_closure = a->bus_reset_closure;
+        if (a->bus_reset != 0) {
                 fill_bus_reset_event(&bus_reset, client);
-                if (copy_to_user(uptr, &bus_reset, sizeof(bus_reset)))
+                if (copy_to_user(u64_to_uptr(a->bus_reset),
+                                 &bus_reset, sizeof(bus_reset)))
                         return -EFAULT;
         }
 
@@ -571,11 +588,9 @@ static int init_request(struct client *client,
         return ret;
 }
 
-static int ioctl_send_request(struct client *client, void *buffer)
+static int ioctl_send_request(struct client *client, union ioctl_arg *arg)
 {
-        struct fw_cdev_send_request *request = buffer;
-
-        switch (request->tcode) {
+        switch (arg->send_request.tcode) {
         case TCODE_WRITE_QUADLET_REQUEST:
         case TCODE_WRITE_BLOCK_REQUEST:
         case TCODE_READ_QUADLET_REQUEST:
@@ -592,7 +607,7 @@ static int ioctl_send_request(struct client *client, void *buffer)
                 return -EINVAL;
         }
 
-        return init_request(client, request, client->device->node_id,
+        return init_request(client, &arg->send_request, client->device->node_id,
                             client->device->max_speed);
 }
 
@@ -683,9 +698,9 @@ static void release_address_handler(struct client *client,
         kfree(r);
 }
 
-static int ioctl_allocate(struct client *client, void *buffer)
+static int ioctl_allocate(struct client *client, union ioctl_arg *arg)
 {
-        struct fw_cdev_allocate *request = buffer;
+        struct fw_cdev_allocate *a = &arg->allocate;
         struct address_handler_resource *r;
         struct fw_address_region region;
         int ret;
@@ -694,13 +709,13 @@ static int ioctl_allocate(struct client *client, void *buffer)
         if (r == NULL)
                 return -ENOMEM;
 
-        region.start = request->offset;
-        region.end = request->offset + request->length;
-        r->handler.length = request->length;
+        region.start = a->offset;
+        region.end   = a->offset + a->length;
+        r->handler.length           = a->length;
         r->handler.address_callback = handle_request;
-        r->handler.callback_data = r;
-        r->closure = request->closure;
-        r->client = client;
+        r->handler.callback_data    = r;
+        r->closure   = a->closure;
+        r->client    = client;
 
         ret = fw_core_add_address_handler(&r->handler, &region);
         if (ret < 0) {
@@ -714,27 +729,25 @@ static int ioctl_allocate(struct client *client, void *buffer)
                 release_address_handler(client, &r->resource);
                 return ret;
         }
-        request->handle = r->resource.handle;
+        a->handle = r->resource.handle;
 
         return 0;
 }
 
-static int ioctl_deallocate(struct client *client, void *buffer)
+static int ioctl_deallocate(struct client *client, union ioctl_arg *arg)
 {
-        struct fw_cdev_deallocate *request = buffer;
-
+        return release_client_resource(client, arg->deallocate.handle,