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:
  firewire: Add more documentation to firewire-cdev.h
  firewire: fix ioctl() return code
  firewire: fix setting tag and sy in iso transmission
  firewire: fw-sbp2: fix another small generation access bug
  firewire: fw-sbp2: enforce s/g segment size limit
  firewire: fw_send_request_sync()
  ieee1394: survive a few seconds connection loss
  ieee1394: nodemgr clean up class iterators
  ieee1394: dv1394, video1394: remove unnecessary expressions
  ieee1394: raw1394: make write() thread-safe
  ieee1394: raw1394: narrow down the state_mutex protected region
  ieee1394: raw1394: replace BKL by local mutex, make ioctl() and mmap() thread-safe
  ieee1394: sbp2: enforce s/g segment size limit
  ieee1394: sbp2: check for DMA mapping failures
  ieee1394: sbp2: stricter dma_sync
  ieee1394: Use DIV_ROUND_UP

1 files changed, 14 insertions, 42 deletions

diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
index bbd73a406e53..418c18f07e9d 100644
--- a/drivers/firewire/fw-card.c
+++ b/drivers/firewire/fw-card.c
@@ -189,39 +189,16 @@ static const char gap_count_table[] = {
         63, 5, 7, 8, 10, 13, 16, 18, 21, 24, 26, 29, 32, 35, 37, 40
 };
 
-struct bm_data {
-        struct fw_transaction t;
-        struct {
-                __be32 arg;
-                __be32 data;
-        } lock;
-        u32 old;
-        int rcode;
-        struct completion done;
-};
-
-static void
-complete_bm_lock(struct fw_card *card, int rcode,
-                 void *payload, size_t length, void *data)
-{
-        struct bm_data *bmd = data;
-
-        if (rcode == RCODE_COMPLETE)
-                bmd->old = be32_to_cpu(*(__be32 *) payload);
-        bmd->rcode = rcode;
-        complete(&bmd->done);
-}
-
 static void
 fw_card_bm_work(struct work_struct *work)
 {
         struct fw_card *card = container_of(work, struct fw_card, work.work);
         struct fw_device *root_device;
         struct fw_node *root_node, *local_node;
-        struct bm_data bmd;
         unsigned long flags;
-        int root_id, new_root_id, irm_id, gap_count, generation, grace;
+        int root_id, new_root_id, irm_id, gap_count, generation, grace, rcode;
         bool do_reset = false;
+        __be32 lock_data[2];
 
         spin_lock_irqsave(&card->lock, flags);
         local_node = card->local_node;
@@ -263,33 +240,28 @@ fw_card_bm_work(struct work_struct *work)
                         goto pick_me;
                 }
 
-                bmd.lock.arg = cpu_to_be32(0x3f);
-                bmd.lock.data = cpu_to_be32(local_node->node_id);
+                lock_data[0] = cpu_to_be32(0x3f);
+                lock_data[1] = cpu_to_be32(local_node->node_id);
 
                 spin_unlock_irqrestore(&card->lock, flags);
 
-                init_completion(&bmd.done);
-                fw_send_request(card, &bmd.t, TCODE_LOCK_COMPARE_SWAP,
-                                irm_id, generation,
-                                SCODE_100, CSR_REGISTER_BASE + CSR_BUS_MANAGER_ID,
-                                &bmd.lock, sizeof(bmd.lock),
-                                complete_bm_lock, &bmd);
-                wait_for_completion(&bmd.done);
+                rcode = fw_run_transaction(card, TCODE_LOCK_COMPARE_SWAP,
+                                irm_id, generation, SCODE_100,
+                                CSR_REGISTER_BASE + CSR_BUS_MANAGER_ID,
+                                lock_data, sizeof(lock_data));
 
-                if (bmd.rcode == RCODE_GENERATION) {
-                        /*
-                         * Another bus reset happened. Just return,
-                         * the BM work has been rescheduled.
-                         */
+                if (rcode == RCODE_GENERATION)
+                        /* Another bus reset, BM work has been rescheduled. */
                         goto out;
-                }
 
-                if (bmd.rcode == RCODE_COMPLETE && bmd.old != 0x3f)
+                if (rcode == RCODE_COMPLETE &&
+                    lock_data[0] != cpu_to_be32(0x3f))
                         /* Somebody else is BM, let them do the work. */
                         goto out;
 
                 spin_lock_irqsave(&card->lock, flags);
-                if (bmd.rcode != RCODE_COMPLETE) {
+
+                if (rcode != RCODE_COMPLETE) {
                         /*
                          * The lock request failed, maybe the IRM
                          * isn't really IRM capable after all. Let's