diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-06-09 16:49:39 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-06-09 16:49:39 +0200 |
| commit | b4c43993f448d0e25fe40690d9e9c81a8ebda623 (patch) | |
| tree | 7cc19990b0b00226ce3063d956790368bfe62ada /drivers/scsi/aic7xxx | |
| parent | include/scsi/osd_protocol.h: remove unnecessary __constant (diff) | |
| parent | mvsas: Recognise device/subsystem 9485/9485 as 88SE9485 (diff) | |
| download | linux-b4c43993f448d0e25fe40690d9e9c81a8ebda623.tar.xz linux-b4c43993f448d0e25fe40690d9e9c81a8ebda623.zip | |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.16' into for-linus
Diffstat (limited to 'drivers/scsi/aic7xxx')
| -rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_pci.c | 18 |
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) for (bit = 0; bit < 8; bit++) { if ((pci_status[i] & (0x1 << bit)) != 0) { - static const char *s; + const char *s; s = pci_status_strings[bit]; if (i == 7/*TARG*/ && bit == 3) @@ -887,23 +887,15 @@ ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat) for (bit = 0; bit < 8; bit++) { - if ((split_status[i] & (0x1 << bit)) != 0) { - static const char *s; - - s = split_status_strings[bit]; - printk(s, ahd_name(ahd), + if ((split_status[i] & (0x1 << bit)) != 0) + printk(split_status_strings[bit], ahd_name(ahd), split_status_source[i]); - } if (i > 1) continue; - if ((sg_split_status[i] & (0x1 << bit)) != 0) { - static const char *s; - - s = split_status_strings[bit]; - printk(s, ahd_name(ahd), "SG"); - } + if ((sg_split_status[i] & (0x1 << bit)) != 0) + printk(split_status_strings[bit], ahd_name(ahd), "SG"); } } /* |