summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@nuts.ninka.net>2002-03-28 00:02:25 -0800
committerDavid S. Miller <davem@nuts.ninka.net>2002-03-28 00:02:25 -0800
commitee2b6d37e5ab4245e01bdbb93ff88139de8dfcc2 (patch)
treefcab6240e544bffef6286c2a614e6e72383dd941
parent8cb95e053775aa795e2ab8677ec7d114603a4931 (diff)
Sparc SBUS fix: Make for_all_sbusdev work with an empty SBUS.
-rw-r--r--include/asm-sparc/sbus.h3
-rw-r--r--include/asm-sparc64/sbus.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-sparc/sbus.h b/include/asm-sparc/sbus.h
index 6a687a465c21..d26fd0326a03 100644
--- a/include/asm-sparc/sbus.h
+++ b/include/asm-sparc/sbus.h
@@ -94,7 +94,8 @@ sbus_is_slave(struct sbus_dev *dev)
for((device) = (bus)->devices; (device); (device)=(device)->next)
#define for_all_sbusdev(device, bus) \
- for((bus) = sbus_root, ((device) = (bus) ? (bus)->devices : 0); (bus); (device)=((device)->next ? (device)->next : ((bus) = (bus)->next, (bus) ? (bus)->devices : 0)))
+ for ((bus) = sbus_root; (bus); (bus) = (bus)->next) \
+ for ((device) = (bus)->devices; (device); (device) = (device)->next)
/* Driver DVMA interfaces. */
#define sbus_can_dma_64bit(sdev) (0) /* actually, sparc_cpu_model==sun4d */
diff --git a/include/asm-sparc64/sbus.h b/include/asm-sparc64/sbus.h
index e9f7344b47cf..5970645950ab 100644
--- a/include/asm-sparc64/sbus.h
+++ b/include/asm-sparc64/sbus.h
@@ -87,7 +87,8 @@ extern struct sbus_bus *sbus_root;
for((device) = (bus)->devices; (device); (device)=(device)->next)
#define for_all_sbusdev(device, bus) \
- for((bus) = sbus_root, ((device) = (bus) ? (bus)->devices : 0); (bus); (device)=((device)->next ? (device)->next : ((bus) = (bus)->next, (bus) ? (bus)->devices : 0)))
+ for ((bus) = sbus_root; (bus); (bus) = (bus)->next) \
+ for ((device) = (bus)->devices; (device); (device) = (device)->next)
/* Driver DVMA interfaces. */
#define sbus_can_dma_64bit(sdev) (1)