Commit 1b81c67a authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley

[PATCH] PATCH [13/15] qla2xxx: Misc. code scrubbing

  Misc. driver scrubbing:

  	o Use kernel #define for PCI command register bit.

  	o Fix rate-limiting check the queue-depth module
  	  parameter.

  	o Clean-up comments.

 drivers/scsi/qla2xxx/qla_init.c |    2 +-
 drivers/scsi/qla2xxx/qla_mbx.c  |    1 -
 drivers/scsi/qla2xxx/qla_os.c   |    7 +++----
 3 files changed, 4 insertions(+), 6 deletions(-)
parent f8bbb011
...@@ -285,7 +285,7 @@ qla2x00_pci_config(scsi_qla_host_t *ha) ...@@ -285,7 +285,7 @@ qla2x00_pci_config(scsi_qla_host_t *ha)
/* PCI Specification Revision 2.3 changes */ /* PCI Specification Revision 2.3 changes */
if (IS_QLA2322(ha) || IS_QLA6322(ha)) if (IS_QLA2322(ha) || IS_QLA6322(ha))
/* Command Register - Reset Interrupt Disable. */ /* Command Register - Reset Interrupt Disable. */
w &= ~BIT_10; w &= ~PCI_COMMAND_INTX_DISABLE;
/* /*
* If this is a 2300 card and not 2312, reset the * If this is a 2300 card and not 2312, reset the
......
...@@ -987,7 +987,6 @@ qla2x00_abort_command(scsi_qla_host_t *ha, srb_t *sp) ...@@ -987,7 +987,6 @@ qla2x00_abort_command(scsi_qla_host_t *ha, srb_t *sp)
if (atomic_read(&ha->loop_state) == LOOP_DOWN || if (atomic_read(&ha->loop_state) == LOOP_DOWN ||
atomic_read(&fcport->state) == FCS_DEVICE_LOST) { atomic_read(&fcport->state) == FCS_DEVICE_LOST) {
/* v2.19.8 Ignore abort request if port is down */
return 1; return 1;
} }
......
...@@ -810,7 +810,7 @@ qla2x00_queuecommand(struct scsi_cmnd *cmd, void (*fn)(struct scsi_cmnd *)) ...@@ -810,7 +810,7 @@ qla2x00_queuecommand(struct scsi_cmnd *cmd, void (*fn)(struct scsi_cmnd *))
atomic_read(&ha2->loop_state) == LOOP_DEAD) { atomic_read(&ha2->loop_state) == LOOP_DEAD) {
/* /*
* Add the command to the done-queue for later failover * Add the command to the done-queue for later failover
* processing * processing.
*/ */
cmd->result = DID_NO_CONNECT << 16; cmd->result = DID_NO_CONNECT << 16;
if (atomic_read(&ha2->loop_state) == LOOP_DOWN) if (atomic_read(&ha2->loop_state) == LOOP_DOWN)
...@@ -1786,10 +1786,9 @@ qla2xxx_slave_configure(struct scsi_device *sdev) ...@@ -1786,10 +1786,9 @@ qla2xxx_slave_configure(struct scsi_device *sdev)
queue_depth = 32; queue_depth = 32;
if (sdev->tagged_supported) { if (sdev->tagged_supported) {
#if defined(MODULE) if (ql2xmaxqdepth != 0 && ql2xmaxqdepth <= 0xffffU)
if (!(ql2xmaxqdepth == 0 || ql2xmaxqdepth > 256))
queue_depth = ql2xmaxqdepth; queue_depth = ql2xmaxqdepth;
#endif
ql2xmaxqdepth = queue_depth; ql2xmaxqdepth = queue_depth;
scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, queue_depth); scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, queue_depth);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment