* [PATCH] [ARM] pxa: clean code in hardware.h
@ 2010-03-12 13:53 Haojian Zhuang
0 siblings, 0 replies; only message in thread
From: Haojian Zhuang @ 2010-03-12 13:53 UTC (permalink / raw)
To: linux-arm-kernel
Avoid too much conditional compilation in hardware.h.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
---
arch/arm/mach-pxa/include/mach/hardware.h | 27 ++++++---------------------
1 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/arch/arm/mach-pxa/include/mach/hardware.h
b/arch/arm/mach-pxa/include/mach/hardware.h
index 3d8d8cb..6694643 100644
--- a/arch/arm/mach-pxa/include/mach/hardware.h
+++ b/arch/arm/mach-pxa/include/mach/hardware.h
@@ -148,63 +148,48 @@
#define __cpu_is_pxa27x(id) (0)
#endif
-#ifdef CONFIG_CPU_PXA300
+#ifdef CONFIG_PXA3xx
#define __cpu_is_pxa300(id) \
({ \
unsigned int _id = (id) >> 4 & 0xfff; \
_id == 0x688; \
})
-#else
-#define __cpu_is_pxa300(id) (0)
-#endif
-#ifdef CONFIG_CPU_PXA310
#define __cpu_is_pxa310(id) \
({ \
unsigned int _id = (id) >> 4 & 0xfff; \
_id == 0x689; \
})
-#else
-#define __cpu_is_pxa310(id) (0)
-#endif
-#ifdef CONFIG_CPU_PXA320
#define __cpu_is_pxa320(id) \
({ \
unsigned int _id = (id) >> 4 & 0xfff; \
_id == 0x603 || _id == 0x682; \
})
-#else
-#define __cpu_is_pxa320(id) (0)
-#endif
-#ifdef CONFIG_CPU_PXA930
#define __cpu_is_pxa930(id) \
({ \
unsigned int _id = (id) >> 4 & 0xfff; \
_id == 0x683; \
})
-#else
-#define __cpu_is_pxa930(id) (0)
-#endif
-#ifdef CONFIG_CPU_PXA935
#define __cpu_is_pxa935(id) \
({ \
unsigned int _id = (id) >> 4 & 0xfff; \
_id == 0x693; \
})
-#else
-#define __cpu_is_pxa935(id) (0)
-#endif
-#ifdef CONFIG_CPU_PXA950
#define __cpu_is_pxa950(id) \
({ \
unsigned int _id = (id) >> 4 & 0xfff; \
_id == 0x697; \
})
#else
+#define __cpu_is_pxa300(id) (0)
+#define __cpu_is_pxa310(id) (0)
+#define __cpu_is_pxa320(id) (0)
+#define __cpu_is_pxa930(id) (0)
+#define __cpu_is_pxa935(id) (0)
#define __cpu_is_pxa950(id) (0)
#endif
--
1.5.6.5
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2010-03-12 13:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-12 13:53 [PATCH] [ARM] pxa: clean code in hardware.h Haojian Zhuang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).