Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Nov 2018 17:34:03 +0000 (10:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Nov 2018 17:34:03 +0000 (10:34 -0700)
Pull more SCSI updates from James Bottomley:
 "This is a set of minor small (and safe changes) that didn't make the
  initial pull request plus some bug fixes"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: mvsas: Remove set but not used variable 'id'
  scsi: qla2xxx: Remove two arguments from qlafx00_error_entry()
  scsi: qla2xxx: Make sure that qlafx00_ioctl_iosb_entry() initializes 'res'
  scsi: qla2xxx: Remove a set-but-not-used variable
  scsi: qla2xxx: Make qla2x00_sysfs_write_nvram() easier to analyze
  scsi: qla2xxx: Declare local functions 'static'
  scsi: qla2xxx: Improve several kernel-doc headers
  scsi: qla2xxx: Modify fall-through annotations
  scsi: 3w-sas: 3w-9xxx: Use unsigned char for cdb
  scsi: mvsas: Use dma_pool_zalloc
  scsi: target: Don't request modules that aren't even built
  scsi: target: Set response length for REPORT TARGET PORT GROUPS

1  2 
drivers/scsi/qla2xxx/qla_os.c

index 8794e54f43a95d568e88ff4944fb0301d1699271,01607d2f2c34709c551a2727c5fecef1575779c5..518f15141170e733d8acee71cf288c31db6c9261
@@@ -1749,7 -1749,7 +1749,7 @@@ qla2x00_loop_reset(scsi_qla_host_t *vha
  static void
  __qla2x00_abort_all_cmds(struct qla_qpair *qp, int res)
  {
-       int cnt, status;
+       int cnt;
        unsigned long flags;
        srb_t *sp;
        scsi_qla_host_t *vha = qp->vha;
                                        if (!sp_get(sp)) {
                                                spin_unlock_irqrestore
                                                        (qp->qp_lock_ptr, flags);
-                                               status = qla2xxx_eh_abort(
-                                                   GET_CMD_SP(sp));
+                                               qla2xxx_eh_abort(
+                                                       GET_CMD_SP(sp));
                                                spin_lock_irqsave
                                                        (qp->qp_lock_ptr, flags);
                                        }
@@@ -6939,6 -6939,8 +6939,6 @@@ qla2xxx_pci_resume(struct pci_dev *pdev
                    "The device failed to resume I/O from slot/link_reset.\n");
        }
  
 -      pci_cleanup_aer_uncorrect_error_status(pdev);
 -
        ha->flags.eeh_busy = 0;
  }