aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2007-12-06 09:48:14 -0500
committerPaul Mackerras <paulus@samba.org>2007-12-10 21:42:17 -0500
commitb9b1812cad14bf921409a76a444a015d22774639 (patch)
treef716479aabc3c7a0b2fca3a6cae7499a0bced9bb
parent9103eb7d3a78ec6e49e49412c45e3b0a2589cbce (diff)
[POWERPC] iSeries: Cleanup PCI retry code a little
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/platforms/iseries/pci.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c
index e4e6ae0acd4..8ef322601f2 100644
--- a/arch/powerpc/platforms/iseries/pci.c
+++ b/arch/powerpc/platforms/iseries/pci.c
@@ -45,8 +45,8 @@
45#include "pci.h" 45#include "pci.h"
46#include "call_pci.h" 46#include "call_pci.h"
47 47
48static int Pci_Retry_Max = 3; /* Only retry 3 times */ 48#define PCI_RETRY_MAX 3
49static int Pci_Error_Flag = 1; /* Set Retry Error on. */ 49static int limit_pci_retries = 1; /* Set Retry Error on. */
50 50
51/* 51/*
52 * Table defines 52 * Table defines
@@ -338,8 +338,8 @@ static int CheckReturnCode(char *TextHdr, struct device_node *DevNode,
338 * Bump the retry and check for retry count exceeded. 338 * Bump the retry and check for retry count exceeded.
339 * If, Exceeded, panic the system. 339 * If, Exceeded, panic the system.
340 */ 340 */
341 if (((*retry) > Pci_Retry_Max) && 341 if (((*retry) > PCI_RETRY_MAX) &&
342 (Pci_Error_Flag > 0)) { 342 (limit_pci_retries > 0)) {
343 mf_display_src(0xB6000103); 343 mf_display_src(0xB6000103);
344 panic_timeout = 0; 344 panic_timeout = 0;
345 panic("PCI: Hardware I/O Error, SRC B6000103, " 345 panic("PCI: Hardware I/O Error, SRC B6000103, "