aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aic7xxx
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-06-09 21:54:06 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-09 21:54:06 -0400
commit1c54fc1efe6922b4e7ffd591739d72050976ccd6 (patch)
tree0f7f0eaa91fa06bba11da240915eb6a4040b482a /drivers/scsi/aic7xxx
parentf4f9b8fc73f9aa93744f0e91e18f367d7766f523 (diff)
parentb4c43993f448d0e25fe40690d9e9c81a8ebda623 (diff)
Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI updates from James Bottomley: "This patch consists of the usual driver updates (qla2xxx, qla4xxx, lpfc, be2iscsi, fnic, ufs, NCR5380) The NCR5380 is the addition to maintained status of a long neglected driver for older hardware. In addition there are a lot of minor fixes and cleanups and some more updates to make scsi mq ready" * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (130 commits) include/scsi/osd_protocol.h: remove unnecessary __constant mvsas: Recognise device/subsystem 9485/9485 as 88SE9485 Revert "be2iscsi: Fix processing cqe for cxn whose endpoint is freed" mptfusion: fix msgContext in mptctl_hp_hostinfo acornscsi: remove linked command support scsi/NCR5380: dprintk macro fusion: Remove use of DEF_SCSI_QCMD fusion: Add free msg frames to the head, not tail of list mpt2sas: Add free smids to the head, not tail of list mpt2sas: Remove use of DEF_SCSI_QCMD mpt2sas: Remove uses of serial_number mpt3sas: Remove use of DEF_SCSI_QCMD mpt3sas: Remove uses of serial_number qla2xxx: Use kmemdup instead of kmalloc + memcpy qla4xxx: Use kmemdup instead of kmalloc + memcpy qla2xxx: fix incorrect debug printk be2iscsi: Bump the driver version be2iscsi: Fix processing cqe for cxn whose endpoint is freed be2iscsi: Fix destroy MCC-CQ before MCC-EQ is destroyed be2iscsi: Fix memory corruption in MBX path ...
Diffstat (limited to 'drivers/scsi/aic7xxx')
-rw-r--r--drivers/scsi/aic7xxx/aic79xx_pci.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
index 14b5f8d0e7f4..cc9bd26f5d1a 100644
--- a/drivers/scsi/aic7xxx/aic79xx_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
@@ -827,7 +827,7 @@ ahd_pci_intr(struct ahd_softc *ahd)
827 for (bit = 0; bit < 8; bit++) { 827 for (bit = 0; bit < 8; bit++) {
828 828
829 if ((pci_status[i] & (0x1 << bit)) != 0) { 829 if ((pci_status[i] & (0x1 << bit)) != 0) {
830 static const char *s; 830 const char *s;
831 831
832 s = pci_status_strings[bit]; 832 s = pci_status_strings[bit];
833 if (i == 7/*TARG*/ && bit == 3) 833 if (i == 7/*TARG*/ && bit == 3)
@@ -887,23 +887,15 @@ ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat)
887 887
888 for (bit = 0; bit < 8; bit++) { 888 for (bit = 0; bit < 8; bit++) {
889 889
890 if ((split_status[i] & (0x1 << bit)) != 0) { 890 if ((split_status[i] & (0x1 << bit)) != 0)
891 static const char *s; 891 printk(split_status_strings[bit], ahd_name(ahd),
892
893 s = split_status_strings[bit];
894 printk(s, ahd_name(ahd),
895 split_status_source[i]); 892 split_status_source[i]);
896 }
897 893
898 if (i > 1) 894 if (i > 1)
899 continue; 895 continue;
900 896
901 if ((sg_split_status[i] & (0x1 << bit)) != 0) { 897 if ((sg_split_status[i] & (0x1 << bit)) != 0)
902 static const char *s; 898 printk(split_status_strings[bit], ahd_name(ahd), "SG");
903
904 s = split_status_strings[bit];
905 printk(s, ahd_name(ahd), "SG");
906 }
907 } 899 }
908 } 900 }
909 /* 901 /*