[SCSI] bfa: clean up one line functions

Cleaned up one line functions.

Signed-off-by: Maggie Zhang <xmzhang@brocade.com>
Signed-off-by: Jing Huang <huangj@brocade.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 11 insertions, 11 deletions

diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
index 4239fdf0d2d1..2bc786212521 100644
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@ -206,7 +206,7 @@ bfad_sm_created(struct bfad_s *bfad, enum bfad_sm_event event)
                 }
 
                 spin_lock_irqsave(&bfad->bfad_lock, flags);
-                bfa_init(&bfad->bfa);
+                bfa_iocfc_init(&bfad->bfa);
                 spin_unlock_irqrestore(&bfad->bfad_lock, flags);
 
                 /* Set up interrupt handler for each vectors */
@@ -725,7 +725,7 @@ bfad_bfa_tmo(unsigned long data)
 
         spin_lock_irqsave(&bfad->bfad_lock, flags);
 
-        bfa_timer_tick(&bfad->bfa);
+        bfa_timer_beat(&bfad->bfa.timer_mod);
 
         bfa_comp_deq(&bfad->bfa, &doneq);
         spin_unlock_irqrestore(&bfad->bfad_lock, flags);
@@ -882,8 +882,8 @@ bfad_drv_init(struct bfad_s *bfad)
                 goto out_hal_mem_alloc_failure;
         }
 
-        bfa_init_trc(&bfad->bfa, bfad->trcmod);
-        bfa_init_plog(&bfad->bfa, &bfad->plog_buf);
+        bfad->bfa.trcmod = bfad->trcmod;
+        bfad->bfa.plog = &bfad->plog_buf;
         bfa_plog_init(&bfad->plog_buf);
         bfa_plog_str(&bfad->plog_buf, BFA_PL_MID_DRVR, BFA_PL_EID_DRIVER_START,
                      0, "Driver Attach");
@@ -893,9 +893,9 @@ bfad_drv_init(struct bfad_s *bfad)
 
         /* FCS INIT */
         spin_lock_irqsave(&bfad->bfad_lock, flags);
-        bfa_fcs_trc_init(&bfad->bfa_fcs, bfad->trcmod);
+        bfad->bfa_fcs.trcmod = bfad->trcmod;
         bfa_fcs_attach(&bfad->bfa_fcs, &bfad->bfa, bfad, BFA_FALSE);
-        bfa_fcs_set_fdmi_param(&bfad->bfa_fcs, fdmi_enable);
+        bfad->bfa_fcs.fdmi_enabled = fdmi_enable;
         spin_unlock_irqrestore(&bfad->bfad_lock, flags);
 
         bfad->bfad_flags |= BFAD_DRV_INIT_DONE;
@@ -913,7 +913,7 @@ bfad_drv_uninit(struct bfad_s *bfad)
 
         spin_lock_irqsave(&bfad->bfad_lock, flags);
         init_completion(&bfad->comp);
-        bfa_stop(&bfad->bfa);
+        bfa_iocfc_stop(&bfad->bfa);
         spin_unlock_irqrestore(&bfad->bfad_lock, flags);
         wait_for_completion(&bfad->comp);
 
@@ -932,8 +932,8 @@ bfad_drv_start(struct bfad_s *bfad)
         unsigned long   flags;
 
         spin_lock_irqsave(&bfad->bfad_lock, flags);
-        bfa_start(&bfad->bfa);
-        bfa_fcs_start(&bfad->bfa_fcs);
+        bfa_iocfc_start(&bfad->bfa);
+        bfa_fcs_fabric_modstart(&bfad->bfa_fcs);
         bfad->bfad_flags |= BFAD_HAL_START_DONE;
         spin_unlock_irqrestore(&bfad->bfad_lock, flags);
 
@@ -963,7 +963,7 @@ bfad_stop(struct bfad_s *bfad)
 
         spin_lock_irqsave(&bfad->bfad_lock, flags);
         init_completion(&bfad->comp);
-        bfa_stop(&bfad->bfa);
+        bfa_iocfc_stop(&bfad->bfa);
         bfad->bfad_flags &= ~BFAD_HAL_START_DONE;
         spin_unlock_irqrestore(&bfad->bfad_lock, flags);
         wait_for_completion(&bfad->comp);
@@ -1524,7 +1524,7 @@ bfad_init(void)
         if (strcmp(FCPI_NAME, " fcpim") == 0)
                 supported_fc4s |= BFA_LPORT_ROLE_FCP_IM;
 
-        bfa_ioc_auto_recover(ioc_auto_recover);
+        bfa_auto_recover = ioc_auto_recover;
         bfa_fcs_rport_set_del_timeout(rport_del_timeout);
 
         error = pci_register_driver(&bfad_pci_driver);