scsi: fnic: Change shost_printk() to FNIC_FCS_DBG()

Replacing shost_printk with FNIC_FCS_DBG() so that these log messages are
controlled by fnic_log_level flag in fnic_fip_handler_timer.

Bumping up version number from 47 to 49 to maintain same level as internal
version.

Link: https://lore.kernel.org/r/20201120220712.16708-1-kartilak@cisco.com
Reviewed-by: Arulprabhu Ponnusamy <arulponn@cisco.com>
Co-developed-by: Satish Kharat <satishkh@cisco.com>
Signed-off-by: Satish Kharat <satishkh@cisco.com>
Signed-off-by: Karan Tilak Kumar <kartilak@cisco.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h
index 477513dc23b740ab27a2b264f1832238f503af93..ed00b6061e0c359716cbaa2a1816f800093541b7 100644 (file)
--- a/drivers/scsi/fnic/fnic.h
+++ b/drivers/scsi/fnic/fnic.h
@@ -39,7 +39,7 @@
 
 #define DRV_NAME               "fnic"
 #define DRV_DESCRIPTION                "Cisco FCoE HBA Driver"
-#define DRV_VERSION            "1.6.0.47"
+#define DRV_VERSION            "1.6.0.49"
 #define PFX                    DRV_NAME ": "
 #define DFX                     DRV_NAME "%d: "
 

diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c
index e3384afb7cbd975733879df2916a94b87f5bad59..3fc3a7271dc1d030e7580769919e450c47d9d8cc 100644 (file)
--- a/drivers/scsi/fnic/fnic_fcs.c
+++ b/drivers/scsi/fnic/fnic_fcs.c
@@ -1349,7 +1349,7 @@ void fnic_handle_fip_timer(struct fnic *fnic)
        }
 
        vlan = list_first_entry(&fnic->vlans, struct fcoe_vlan, list);
-       shost_printk(KERN_DEBUG, fnic->lport->host,
+       FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host,
                  "fip_timer: vlan %d state %d sol_count %d\n",
                  vlan->vid, vlan->state, vlan->sol_count);
        switch (vlan->state) {
@@ -1372,7 +1372,7 @@ void fnic_handle_fip_timer(struct fnic *fnic)
                         * no response on this vlan, remove  from the list.
                         * Try the next vlan
                         */
-                       shost_printk(KERN_INFO, fnic->lport->host,
+                       FNIC_FCS_DBG(KERN_INFO, fnic->lport->host,
                                  "Dequeue this VLAN ID %d from list\n",
                                  vlan->vid);
                        list_del(&vlan->list);
@@ -1382,7 +1382,7 @@ void fnic_handle_fip_timer(struct fnic *fnic)
                                /* we exhausted all vlans, restart vlan disc */
                                spin_unlock_irqrestore(&fnic->vlans_lock,
                                                        flags);
-                               shost_printk(KERN_INFO, fnic->lport->host,
+                               FNIC_FCS_DBG(KERN_INFO, fnic->lport->host,
                                          "fip_timer: vlan list empty, "
                                          "trigger vlan disc\n");
                                fnic_event_enq(fnic, FNIC_EVT_START_VLAN_DISC);