diff options
author | Madhuranath Iyengar <Madhu.Iyengar@qlogic.com> | 2010-10-15 14:27:44 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-10-25 17:02:38 -0400 |
commit | 09d1dc2a001c599e8e5875e246a2f29be81ceef1 (patch) | |
tree | d838327eae29277e6969e831af70ba2f67a78851 /drivers/scsi/qla2xxx/qla_os.c | |
parent | f19af1636bda8454401fa76ce4ad027412d5d07a (diff) |
[SCSI] qla2xxx: Remove scsi_cmnd->serial_number from debug traces
This patch cleans up any printk or debug tracing of the the
serial_number field in the qla2xxx driver.
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_os.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 65040a584109..2d3273bc48ee 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
@@ -831,7 +831,6 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd) | |||
831 | srb_t *sp; | 831 | srb_t *sp; |
832 | int ret, i; | 832 | int ret, i; |
833 | unsigned int id, lun; | 833 | unsigned int id, lun; |
834 | unsigned long serial; | ||
835 | unsigned long flags; | 834 | unsigned long flags; |
836 | int wait = 0; | 835 | int wait = 0; |
837 | struct qla_hw_data *ha = vha->hw; | 836 | struct qla_hw_data *ha = vha->hw; |
@@ -848,7 +847,6 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd) | |||
848 | 847 | ||
849 | id = cmd->device->id; | 848 | id = cmd->device->id; |
850 | lun = cmd->device->lun; | 849 | lun = cmd->device->lun; |
851 | serial = cmd->serial_number; | ||
852 | spt = (srb_t *) CMD_SP(cmd); | 850 | spt = (srb_t *) CMD_SP(cmd); |
853 | if (!spt) | 851 | if (!spt) |
854 | return SUCCESS; | 852 | return SUCCESS; |
@@ -866,8 +864,8 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd) | |||
866 | if (sp->cmd != cmd) | 864 | if (sp->cmd != cmd) |
867 | continue; | 865 | continue; |
868 | 866 | ||
869 | DEBUG2(printk("%s(%ld): aborting sp %p from RISC." | 867 | DEBUG2(printk("%s(%ld): aborting sp %p from RISC.", |
870 | " pid=%ld.\n", __func__, vha->host_no, sp, serial)); | 868 | __func__, vha->host_no, sp)); |
871 | 869 | ||
872 | /* Get a reference to the sp and drop the lock.*/ | 870 | /* Get a reference to the sp and drop the lock.*/ |
873 | sp_get(sp); | 871 | sp_get(sp); |
@@ -892,8 +890,8 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd) | |||
892 | if (wait) { | 890 | if (wait) { |
893 | if (qla2x00_eh_wait_on_command(cmd) != QLA_SUCCESS) { | 891 | if (qla2x00_eh_wait_on_command(cmd) != QLA_SUCCESS) { |
894 | qla_printk(KERN_ERR, ha, | 892 | qla_printk(KERN_ERR, ha, |
895 | "scsi(%ld:%d:%d): Abort handler timed out -- %lx " | 893 | "scsi(%ld:%d:%d): Abort handler timed out -- %x.\n", |
896 | "%x.\n", vha->host_no, id, lun, serial, ret); | 894 | vha->host_no, id, lun, ret); |
897 | ret = FAILED; | 895 | ret = FAILED; |
898 | } | 896 | } |
899 | } | 897 | } |
@@ -902,8 +900,8 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd) | |||
902 | qla2x00_sp_compl(ha, sp); | 900 | qla2x00_sp_compl(ha, sp); |
903 | 901 | ||
904 | qla_printk(KERN_INFO, ha, | 902 | qla_printk(KERN_INFO, ha, |
905 | "scsi(%ld:%d:%d): Abort command issued -- %d %lx %x.\n", | 903 | "scsi(%ld:%d:%d): Abort command issued -- %d %x.\n", |
906 | vha->host_no, id, lun, wait, serial, ret); | 904 | vha->host_no, id, lun, wait, ret); |
907 | 905 | ||
908 | return ret; | 906 | return ret; |
909 | } | 907 | } |
@@ -1048,13 +1046,11 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd) | |||
1048 | fc_port_t *fcport = (struct fc_port *) cmd->device->hostdata; | 1046 | fc_port_t *fcport = (struct fc_port *) cmd->device->hostdata; |
1049 | int ret = FAILED; | 1047 | int ret = FAILED; |
1050 | unsigned int id, lun; | 1048 | unsigned int id, lun; |
1051 | unsigned long serial; | ||
1052 | 1049 | ||
1053 | fc_block_scsi_eh(cmd); | 1050 | fc_block_scsi_eh(cmd); |
1054 | 1051 | ||
1055 | id = cmd->device->id; | 1052 | id = cmd->device->id; |
1056 | lun = cmd->device->lun; | 1053 | lun = cmd->device->lun; |
1057 | serial = cmd->serial_number; | ||
1058 | 1054 | ||
1059 | if (!fcport) | 1055 | if (!fcport) |
1060 | return ret; | 1056 | return ret; |
@@ -1109,14 +1105,12 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd) | |||
1109 | struct qla_hw_data *ha = vha->hw; | 1105 | struct qla_hw_data *ha = vha->hw; |
1110 | int ret = FAILED; | 1106 | int ret = FAILED; |
1111 | unsigned int id, lun; | 1107 | unsigned int id, lun; |
1112 | unsigned long serial; | ||
1113 | scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev); | 1108 | scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev); |
1114 | 1109 | ||
1115 | fc_block_scsi_eh(cmd); | 1110 | fc_block_scsi_eh(cmd); |
1116 | 1111 | ||
1117 | id = cmd->device->id; | 1112 | id = cmd->device->id; |
1118 | lun = cmd->device->lun; | 1113 | lun = cmd->device->lun; |
1119 | serial = cmd->serial_number; | ||
1120 | 1114 | ||
1121 | if (!fcport) | 1115 | if (!fcport) |
1122 | return ret; | 1116 | return ret; |