aboutsummaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>2009-09-07 17:11:29 +0900
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-09-09 13:48:19 -0700
commit24dbb7beb2a207f423006c46830dfaacca5a1139 (patch)
tree2a2b7b85c11eb784c691c0857c59e8a6053004ae /drivers/pci
parent0d465f23502e0810443c90a9cf1cf5686c4af4f2 (diff)
PCI: pcie, aer: remove spinlock in aerdrv_errprint.c
The static buffer errmsg_buff[] is used only for building error message in fixed format, and is protected by a spinlock. This patch removes this buffer and the spinlock. Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> Reviewed-by: Andrew Patterson <andrew.patterson@hp.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pcie/aer/aerdrv_errprint.c28
1 files changed, 8 insertions, 20 deletions
diff --git a/drivers/pci/pcie/aer/aerdrv_errprint.c b/drivers/pci/pcie/aer/aerdrv_errprint.c
index a2a4b3903a7..95c3f1ca807 100644
--- a/drivers/pci/pcie/aer/aerdrv_errprint.c
+++ b/drivers/pci/pcie/aer/aerdrv_errprint.c
@@ -152,38 +152,31 @@ static char *aer_agent_string[] = {
"Transmitter ID"
};
-static char *aer_get_error_source_name(int severity,
- unsigned int status,
- char errmsg_buff[])
+static void aer_print_error_source(struct aer_err_info *info)
{
int i;
char *errmsg = NULL;
for (i = 0; i < 32; i++) {
- if (!(status & (1 << i)))
+ if (!(info->status & (1 << i)))
continue;
- if (severity == AER_CORRECTABLE)
+ if (info->severity == AER_CORRECTABLE)
errmsg = aer_correctable_error_string[i];
else
errmsg = aer_uncorrectable_error_string[i];
- if (!errmsg) {
- sprintf(errmsg_buff, "Unknown Error Bit %2d ", i);
- errmsg = errmsg_buff;
- }
+ if (errmsg)
+ AER_PR(info, "%s\t:\n", errmsg);
+ else
+ AER_PR(info, "Unknown Error Bit %2d \t:\n", i);
break;
}
-
- return errmsg;
}
-static DEFINE_SPINLOCK(logbuf_lock);
-static char errmsg_buff[100];
void aer_print_error(struct pci_dev *dev, struct aer_err_info *info)
{
- char *errmsg;
int err_layer, agent;
int id = ((dev->bus->number << 8) | dev->devfn);
@@ -199,12 +192,7 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info)
AER_PR(info, "PCIE Bus Error type\t: %s\n",
aer_error_layer[err_layer]);
- spin_lock(&logbuf_lock);
- errmsg = aer_get_error_source_name(info->severity,
- info->status,
- errmsg_buff);
- AER_PR(info, "%s\t:\n", errmsg);
- spin_unlock(&logbuf_lock);
+ aer_print_error_source(info);
agent = AER_GET_AGENT(info->severity, info->status);
AER_PR(info, "%s\t\t: %04x\n", aer_agent_string[agent], id);