1 files changed, 29 insertions, 17 deletions

diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
index 50120c285fff..3516172c597c 100644
--- a/drivers/scsi/bfa/bfa_fcs.c
+++ b/drivers/scsi/bfa/bfa_fcs.c
@@ -36,6 +36,7 @@
  * FCS sub-modules
  */
 struct bfa_fcs_mod_s {
+        void            (*attach) (struct bfa_fcs_s *fcs);
         void            (*modinit) (struct bfa_fcs_s *fcs);
         void            (*modexit) (struct bfa_fcs_s *fcs);
 };
@@ -43,12 +44,10 @@ struct bfa_fcs_mod_s {
 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
 
 static struct bfa_fcs_mod_s fcs_modules[] = {
-        BFA_FCS_MODULE(bfa_fcs_pport),
-        BFA_FCS_MODULE(bfa_fcs_uf),
-        BFA_FCS_MODULE(bfa_fcs_fabric),
-        BFA_FCS_MODULE(bfa_fcs_vport),
-        BFA_FCS_MODULE(bfa_fcs_rport),
-        BFA_FCS_MODULE(bfa_fcs_fcpim),
+        { bfa_fcs_pport_attach, NULL, NULL },
+        { bfa_fcs_uf_attach, NULL, NULL },
+        { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
+         bfa_fcs_fabric_modexit },
 };
 
 /**
@@ -71,16 +70,10 @@ bfa_fcs_exit_comp(void *fcs_cbarg)
  */
 
 /**
- *              FCS instance initialization.
- *
- *      param[in]               fcs             FCS instance
- *      param[in]               bfa             BFA instance
- *      param[in]               bfad            BFA driver instance
- *
- *      return None
+ * fcs attach -- called once to initialize data structures at driver attach time
  */
 void
-bfa_fcs_init(struct bfa_fcs_s *fcs, struct bfa_s *bfa, struct bfad_s *bfad,
+bfa_fcs_attach(struct bfa_fcs_s *fcs, struct bfa_s *bfa, struct bfad_s *bfad,
                         bfa_boolean_t min_cfg)
 {
         int             i;
@@ -95,7 +88,24 @@ bfa_fcs_init(struct bfa_fcs_s *fcs, struct bfa_s *bfa, struct bfad_s *bfad,
 
         for (i = 0; i < sizeof(fcs_modules) / sizeof(fcs_modules[0]); i++) {
                 mod = &fcs_modules[i];
-                mod->modinit(fcs);
+                if (mod->attach)
+                        mod->attach(fcs);
+        }
+}
+
+/**
+ * fcs initialization, called once after bfa initialization is complete
+ */
+void
+bfa_fcs_init(struct bfa_fcs_s *fcs)
+{
+        int             i;
+        struct bfa_fcs_mod_s  *mod;
+
+        for (i = 0; i < sizeof(fcs_modules) / sizeof(fcs_modules[0]); i++) {
+                mod = &fcs_modules[i];
+                if (mod->modinit)
+                        mod->modinit(fcs);
         }
 }
 
@@ -160,10 +170,12 @@ bfa_fcs_exit(struct bfa_fcs_s *fcs)
         nmods = sizeof(fcs_modules) / sizeof(fcs_modules[0]);
 
         for (i = 0; i < nmods; i++) {
-                bfa_wc_up(&fcs->wc);
 
                 mod = &fcs_modules[i];
-                mod->modexit(fcs);
+                if (mod->modexit) {
+                        bfa_wc_up(&fcs->wc);
+                        mod->modexit(fcs);
+                }
         }
 
         bfa_wc_wait(&fcs->wc);