[SCSI] bnx2fc: Move offload/upload wait logic into a function

Moved the 'waiting for upload/offload completion' logic to respective
functions as it is called in multiple places. Also this is done in
preperation for the next patch.

Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 30 insertions, 35 deletions

diff --git a/drivers/scsi/bnx2fc/bnx2fc_tgt.c b/drivers/scsi/bnx2fc/bnx2fc_tgt.c
index eba2328f60e7..236d8894bd82 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_tgt.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_tgt.c
@@ -59,6 +59,20 @@ static void bnx2fc_ofld_timer(unsigned long data)
         wake_up_interruptible(&tgt->ofld_wait);
 }
 
+static void bnx2fc_ofld_wait(struct bnx2fc_rport *tgt)
+{
+        setup_timer(&tgt->ofld_timer, bnx2fc_ofld_timer, (unsigned long)tgt);
+        mod_timer(&tgt->ofld_timer, jiffies + BNX2FC_FW_TIMEOUT);
+
+        wait_event_interruptible(tgt->ofld_wait,
+                                 (test_bit(
+                                  BNX2FC_FLAG_OFLD_REQ_CMPL,
+                                  &tgt->flags)));
+        if (signal_pending(current))
+                flush_signals(current);
+        del_timer_sync(&tgt->ofld_timer);
+}
+
 static void bnx2fc_offload_session(struct fcoe_port *port,
                                         struct bnx2fc_rport *tgt,
                                         struct fc_rport_priv *rdata)
@@ -103,17 +117,7 @@ retry_ofld:
          * wait for the session is offloaded and enabled. 3 Secs
          * should be ample time for this process to complete.
          */
-        setup_timer(&tgt->ofld_timer, bnx2fc_ofld_timer, (unsigned long)tgt);
-        mod_timer(&tgt->ofld_timer, jiffies + BNX2FC_FW_TIMEOUT);
-
-        wait_event_interruptible(tgt->ofld_wait,
-                                 (test_bit(
-                                  BNX2FC_FLAG_OFLD_REQ_CMPL,
-                                  &tgt->flags)));
-        if (signal_pending(current))
-                flush_signals(current);
-
-        del_timer_sync(&tgt->ofld_timer);
+        bnx2fc_ofld_wait(tgt);
 
         if (!(test_bit(BNX2FC_FLAG_OFFLOADED, &tgt->flags))) {
                 if (test_and_clear_bit(BNX2FC_FLAG_CTX_ALLOC_FAILURE,
@@ -259,6 +263,19 @@ void bnx2fc_flush_active_ios(struct bnx2fc_rport *tgt)
         spin_unlock_bh(&tgt->tgt_lock);
 }
 
+static void bnx2fc_upld_wait(struct bnx2fc_rport *tgt)
+{
+        setup_timer(&tgt->upld_timer, bnx2fc_upld_timer, (unsigned long)tgt);
+        mod_timer(&tgt->upld_timer, jiffies + BNX2FC_FW_TIMEOUT);
+        wait_event_interruptible(tgt->upld_wait,
+                                 (test_bit(
+                                  BNX2FC_FLAG_UPLD_REQ_COMPL,
+                                  &tgt->flags)));
+        if (signal_pending(current))
+                flush_signals(current);
+        del_timer_sync(&tgt->upld_timer);
+}
+
 static void bnx2fc_upload_session(struct fcoe_port *port,
                                         struct bnx2fc_rport *tgt)
 {
@@ -279,19 +296,8 @@ static void bnx2fc_upload_session(struct fcoe_port *port,
          * wait for upload to complete. 3 Secs
          * should be sufficient time for this process to complete.
          */
-        setup_timer(&tgt->upld_timer, bnx2fc_upld_timer, (unsigned long)tgt);
-        mod_timer(&tgt->upld_timer, jiffies + BNX2FC_FW_TIMEOUT);
-
         BNX2FC_TGT_DBG(tgt, "waiting for disable compl\n");
-        wait_event_interruptible(tgt->upld_wait,
-                                 (test_bit(
-                                  BNX2FC_FLAG_UPLD_REQ_COMPL,
-                                  &tgt->flags)));
-
-        if (signal_pending(current))
-                flush_signals(current);
-
-        del_timer_sync(&tgt->upld_timer);
+        bnx2fc_upld_wait(tgt);
 
         /*
          * traverse thru the active_q and tmf_q and cleanup
@@ -308,24 +314,13 @@ static void bnx2fc_upload_session(struct fcoe_port *port,
                 bnx2fc_send_session_destroy_req(hba, tgt);
 
                 /* wait for destroy to complete */
-                setup_timer(&tgt->upld_timer,
-                            bnx2fc_upld_timer, (unsigned long)tgt);
-                mod_timer(&tgt->upld_timer, jiffies + BNX2FC_FW_TIMEOUT);
-
-                wait_event_interruptible(tgt->upld_wait,
-                                         (test_bit(
-                                          BNX2FC_FLAG_UPLD_REQ_COMPL,
-                                          &tgt->flags)));
+                bnx2fc_upld_wait(tgt);
 
                 if (!(test_bit(BNX2FC_FLAG_DESTROYED, &tgt->flags)))
                         printk(KERN_ERR PFX "ERROR!! destroy timed out\n");
 
                 BNX2FC_TGT_DBG(tgt, "destroy wait complete flags = 0x%lx\n",
                         tgt->flags);
-                if (signal_pending(current))
-                        flush_signals(current);
-
-                del_timer_sync(&tgt->upld_timer);
 
         } else if (test_bit(BNX2FC_FLAG_DISABLE_FAILED, &tgt->flags)) {
                 printk(KERN_ERR PFX "ERROR!! DISABLE req failed, destroy"