lpfc: Remove global lpfc_enable_npiv attribute in leiu of per-hba lpfc_enable_npiv

Remove global lpfc_enable_npiv attribute in leiu of per-hba lpfc_enable_npiv

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index a75404ae4fc189e7ec2a253eb13bdbdd3a38836c..25d91a86e4a6032dac6bd4e92cf5b8525c7d8a47 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -2844,12 +2844,8 @@ MODULE_PARM_DESC(lpfc_sli_mode, "SLI mode selector:"
                 " 2 - select SLI-2 even on SLI-3 capable HBAs,"
                 " 3 - select SLI-3");
 
-int lpfc_enable_npiv = 1;
-module_param(lpfc_enable_npiv, int, S_IRUGO);
-MODULE_PARM_DESC(lpfc_enable_npiv, "Enable NPIV functionality");
-lpfc_param_show(enable_npiv);
-lpfc_param_init(enable_npiv, 1, 0, 1);
-static DEVICE_ATTR(lpfc_enable_npiv, S_IRUGO, lpfc_enable_npiv_show, NULL);
+LPFC_ATTR_R(enable_npiv, 1, 0, 1,
+       "Enable NPIV functionality");
 
 LPFC_ATTR_R(fcf_failover_policy, 1, 1, 2,
        "FCF Fast failover=1 Priority failover=2");

diff --git a/drivers/scsi/lpfc/lpfc_crtn.h b/drivers/scsi/lpfc/lpfc_crtn.h
index bc0e2f197ff5c0c03a355bf7cd2123e2587a9b4d..b8a2ddc49e5000ed0e98fd7e3c83388ad0957dd2 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_crtn.h
+++ b/drivers/scsi/lpfc/lpfc_crtn.h
@@ -360,7 +360,6 @@ extern struct scsi_host_template lpfc_vport_template;
 extern struct fc_function_template lpfc_transport_functions;
 extern struct fc_function_template lpfc_vport_transport_functions;
 extern int lpfc_sli_mode;
-extern int lpfc_enable_npiv;
 extern int lpfc_delay_discovery;
 
 int  lpfc_vport_symbolic_node_name(struct lpfc_vport *, char *, size_t);

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index f4b3548f101a686e44faf35b24f9778184cc9ded..adf61b43eb70716f5b00d2c019fec6e4099376e1 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -11441,21 +11441,17 @@ lpfc_init(void)
                printk(KERN_ERR "Could not register lpfcmgmt device, "
                        "misc_register returned with status %d", error);
 
-       if (lpfc_enable_npiv) {
-               lpfc_transport_functions.vport_create = lpfc_vport_create;
-               lpfc_transport_functions.vport_delete = lpfc_vport_delete;
-       }
+       lpfc_transport_functions.vport_create = lpfc_vport_create;
+       lpfc_transport_functions.vport_delete = lpfc_vport_delete;
        lpfc_transport_template =
                                fc_attach_transport(&lpfc_transport_functions);
        if (lpfc_transport_template == NULL)
                return -ENOMEM;
-       if (lpfc_enable_npiv) {
-               lpfc_vport_transport_template =
-                       fc_attach_transport(&lpfc_vport_transport_functions);
-               if (lpfc_vport_transport_template == NULL) {
-                       fc_release_transport(lpfc_transport_template);
-                       return -ENOMEM;
-               }
+       lpfc_vport_transport_template =
+               fc_attach_transport(&lpfc_vport_transport_functions);
+       if (lpfc_vport_transport_template == NULL) {
+               fc_release_transport(lpfc_transport_template);
+               return -ENOMEM;
        }
 
        /* Initialize in case vector mapping is needed */
@@ -11467,8 +11463,7 @@ lpfc_init(void)
        error = pci_register_driver(&lpfc_driver);
        if (error) {
                fc_release_transport(lpfc_transport_template);
-               if (lpfc_enable_npiv)
-                       fc_release_transport(lpfc_vport_transport_template);
+               fc_release_transport(lpfc_vport_transport_template);
        }
 
        return error;
@@ -11487,8 +11482,7 @@ lpfc_exit(void)
        misc_deregister(&lpfc_mgmt_dev);
        pci_unregister_driver(&lpfc_driver);
        fc_release_transport(lpfc_transport_template);
-       if (lpfc_enable_npiv)
-               fc_release_transport(lpfc_vport_transport_template);
+       fc_release_transport(lpfc_vport_transport_template);
        if (_dump_buf_data) {
                printk(KERN_ERR "9062 BLKGRD: freeing %lu pages for "
                                "_dump_buf_data at 0x%p\n",