Commit b413cf49 authored by Mathias Krause's avatar Mathias Krause Committed by Christoph Hellwig

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: default avatarMathias Krause <minipli@googlemail.com>
Acked-by: default avatarHannes Reinecke <hare@suse.de>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: PaX Team <pageexec@freemail.hu>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 806188a4
...@@ -827,7 +827,7 @@ ahd_pci_intr(struct ahd_softc *ahd) ...@@ -827,7 +827,7 @@ ahd_pci_intr(struct ahd_softc *ahd)
for (bit = 0; bit < 8; bit++) { for (bit = 0; bit < 8; bit++) {
if ((pci_status[i] & (0x1 << bit)) != 0) { if ((pci_status[i] & (0x1 << bit)) != 0) {
static const char *s; const char *s;
s = pci_status_strings[bit]; s = pci_status_strings[bit];
if (i == 7/*TARG*/ && bit == 3) if (i == 7/*TARG*/ && bit == 3)
...@@ -887,23 +887,15 @@ ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat) ...@@ -887,23 +887,15 @@ ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat)
for (bit = 0; bit < 8; bit++) { for (bit = 0; bit < 8; bit++) {
if ((split_status[i] & (0x1 << bit)) != 0) { if ((split_status[i] & (0x1 << bit)) != 0)
static const char *s; printk(split_status_strings[bit], ahd_name(ahd),
s = split_status_strings[bit];
printk(s, ahd_name(ahd),
split_status_source[i]); split_status_source[i]);
}
if (i > 1) if (i > 1)
continue; continue;
if ((sg_split_status[i] & (0x1 << bit)) != 0) { if ((sg_split_status[i] & (0x1 << bit)) != 0)
static const char *s; printk(split_status_strings[bit], ahd_name(ahd), "SG");
s = split_status_strings[bit];
printk(s, ahd_name(ahd), "SG");
}
} }
} }
/* /*
......
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