Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / scsi / bfa / bfad.c

diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
index 6797720213b233bf444937445be983630e60d50d..44524cf55d3396b6c2339357bd3bdeebd400c390 100644 (file)
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@ -32,7 +32,6 @@
 #include "bfad_drv.h"
 #include "bfad_im.h"
 #include "bfa_fcs.h"
-#include "bfa_os_inc.h"
 #include "bfa_defs.h"
 #include "bfa.h"
 
@@ -61,12 +60,12 @@ int         msix_disable_cb = 0, msix_disable_ct = 0;
 u32    bfi_image_ct_fc_size, bfi_image_ct_cna_size, bfi_image_cb_fc_size;
 u32     *bfi_image_ct_fc, *bfi_image_ct_cna, *bfi_image_cb_fc;
 
-const char *msix_name_ct[] = {
+static const char *msix_name_ct[] = {
        "cpe0", "cpe1", "cpe2", "cpe3",
        "rme0", "rme1", "rme2", "rme3",
        "ctrl" };
 
-const char *msix_name_cb[] = {
+static const char *msix_name_cb[] = {
        "cpe0", "cpe1", "cpe2", "cpe3",
        "rme0", "rme1", "rme2", "rme3",
        "eemc", "elpu0", "elpu1", "epss", "mlpu" };
@@ -206,7 +205,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 */
@@ -533,7 +532,7 @@ bfad_hal_mem_release(struct bfad_s *bfad)
                                        (dma_addr_t) meminfo_elem->dma);
                                break;
                        default:
-                               bfa_assert(0);
+                               WARN_ON(1);
                                break;
                        }
                }
@@ -725,7 +724,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 +881,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 +892,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 +912,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 +931,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 +962,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);
@@ -1102,15 +1101,15 @@ bfad_start_ops(struct bfad_s *bfad) {
 
        /*
         * If bfa_linkup_delay is set to -1 default; try to retrive the
-        * value using the bfad_os_get_linkup_delay(); else use the
+        * value using the bfad_get_linkup_delay(); else use the
         * passed in module param value as the bfa_linkup_delay.
         */
        if (bfa_linkup_delay < 0) {
-               bfa_linkup_delay = bfad_os_get_linkup_delay(bfad);
-               bfad_os_rport_online_wait(bfad);
+               bfa_linkup_delay = bfad_get_linkup_delay(bfad);
+               bfad_rport_online_wait(bfad);
                bfa_linkup_delay = -1;
        } else
-               bfad_os_rport_online_wait(bfad);
+               bfad_rport_online_wait(bfad);
 
        BFA_LOG(KERN_INFO, bfad, bfa_log_level, "bfa device claimed\n");
 
@@ -1167,7 +1166,6 @@ bfad_intx(int irq, void *dev_id)
                spin_lock_irqsave(&bfad->bfad_lock, flags);
                bfa_comp_free(&bfad->bfa, &doneq);
                spin_unlock_irqrestore(&bfad->bfad_lock, flags);
-               bfa_trc_fp(bfad, irq);
        }
 
        return IRQ_HANDLED;
@@ -1524,7 +1522,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);