diff mbox series

scsi: fnic: Change shost_printk with FNIC_FCS_DBG

Message ID 20201120220712.16708-1-kartilak@cisco.com (mailing list archive)
State Accepted
Headers show
Series scsi: fnic: Change shost_printk with FNIC_FCS_DBG | expand

Commit Message

Karan Tilak Kumar (kartilak) Nov. 20, 2020, 10:07 p.m. UTC 
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.

Signed-off-by: Karan Tilak Kumar <kartilak@cisco.com>
Signed-off-by: Satish Kharat <satishkh@cisco.com>
---
 drivers/scsi/fnic/fnic.h     | 2 +-
 drivers/scsi/fnic/fnic_fcs.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

Arulprabhu Ponnusamy (arulponn) Nov. 24, 2020, 1:10 a.m. UTC | #1 
Changes look good.
Reviewed-by: Arulprabhu Ponnusamy <arulponn@cisco.com>

On 11/20/20, 2:08 PM, "Karan Tilak Kumar" <kartilak@cisco.com> wrote:

    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.

    Signed-off-by: Karan Tilak Kumar <kartilak@cisco.com>
    Signed-off-by: Satish Kharat <satishkh@cisco.com>
    ---
     drivers/scsi/fnic/fnic.h     | 2 +-
     drivers/scsi/fnic/fnic_fcs.c | 6 +++---
     2 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h
    index 477513dc23b7..ed00b6061e0c 100644
    --- 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 e3384afb7cbd..3fc3a7271dc1 100644
    --- 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);
    -- 
    2.29.2
Martin K. Petersen Nov. 24, 2020, 3:48 a.m. UTC | #2 
Karan,

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

Applied to 5.11/scsi-staging, thanks!
Martin K. Petersen Dec. 1, 2020, 5:04 a.m. UTC | #3 
On Fri, 20 Nov 2020 14:07:12 -0800, Karan Tilak Kumar wrote:

> 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.

Applied to 5.11/scsi-queue, thanks!

[1/1] scsi: fnic: Change shost_printk() to FNIC_FCS_DBG()
      https://git.kernel.org/mkp/scsi/c/90b3a938031f
diff mbox series

Patch

diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h
index 477513dc23b7..ed00b6061e0c 100644
--- 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 e3384afb7cbd..3fc3a7271dc1 100644
--- 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);