summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aic7xxx
diff options
context:
space:
mode:
authorMathias Krause <minipli@googlemail.com>2014-05-01 11:48:25 +0200
committerChristoph Hellwig <hch@lst.de>2014-05-19 19:12:23 +0200
commitb413cf490682d39a95e80a4751022b858d21bc6b (patch)
tree46cd65a864d2cdcffc2481d6c4d6458aa6140ec0 /drivers/scsi/aic7xxx
parent806188a43c69c4e02895cb812bb4cd89afe2bd16 (diff)
downloadop-kernel-dev-b413cf490682d39a95e80a4751022b858d21bc6b.zip
op-kernel-dev-b413cf490682d39a95e80a4751022b858d21bc6b.tar.gz
aic79xx: fix misuse of static variables
The format strings for various printk()s make use of a temporary variable that is declared 'static'. This is probably not intended, so fix those. Found in the PaX patch, written by the PaX Team. Signed-off-by: Mathias Krause <minipli@googlemail.com> Acked-by: Hannes Reinecke <hare@suse.de> Cc: "James E.J. Bottomley" <JBottomley@parallels.com> Cc: PaX Team <pageexec@freemail.hu> Signed-off-by: Christoph Hellwig <hch@lst.de>
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 14b5f8d..cc9bd26 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");
}
}
/*
OpenPOWER on IntegriCloud