Skip to contentSkip to conversation

sparc: merge of_platform_{32,64}.h

PATCH In review Stephen Rothwell 2 participants 2 messages Jul 30, 2008 SPARC + UltraSPARC (sparc/sparc64)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sparc: merge of_platform_{32,64}.h

The only difference between these files is that the 64 bit version has an extra declaration.

---
 arch/sparc/include/asm/of_platform.h    |   27 +++++++++++++++++++++++----
 arch/sparc/include/asm/of_platform_32.h |   24 ------------------------
 arch/sparc/include/asm/of_platform_64.h |   25 -------------------------
 3 files changed, 23 insertions(+), 53 deletions(-)
 delete mode 100644 arch/sparc/include/asm/of_platform_32.h
 delete mode 100644 arch/sparc/include/asm/of_platform_64.h

This has been built for defconfig for sparc32 and sparc64.

arch/sparc/include/asm/of_platform.h +23 -4
index aa69977..972352f 100644
@@ -1,8 +1,27 @@
 #ifndef ___ASM_SPARC_OF_PLATFORM_H
 #define ___ASM_SPARC_OF_PLATFORM_H
-#if defined(__sparc__) && defined(__arch64__)
-#include <asm/of_platform_64.h>
-#else
-#include <asm/of_platform_32.h>
+/*
+ *    Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.
+ *			 <[email protected]>
+ *    Modified for Sparc by merging parts of asm/of_device.h
+ *		by Stephen Rothwell
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version
+ *  2 of the License, or (at your option) any later version.
+ *
+ */
+
+/* This is just here during the transition */
+#include <linux/of_platform.h>
+
+#ifdef CONFIG_SPARC64
+extern struct bus_type isa_bus_type;
 #endif
+extern struct bus_type ebus_bus_type;
+extern struct bus_type sbus_bus_type;
+
+#define of_bus_type	of_platform_bus_type	/* for compatibility */
+
 #endif
arch/sparc/include/asm/of_platform_32.h deleted +0 -24
deleted file mode 100644
index 723f7c9..0000000
@@ -1,24 +0,0 @@
-#ifndef _ASM_SPARC_OF_PLATFORM_H
-#define _ASM_SPARC_OF_PLATFORM_H
-/*
- *    Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.
- *			 <[email protected]>
- *    Modified for Sparc by merging parts of asm/of_device.h
- *		by Stephen Rothwell
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version
- *  2 of the License, or (at your option) any later version.
- *
- */
-
-/* This is just here during the transition */
-#include <linux/of_platform.h>
-
-extern struct bus_type ebus_bus_type;
-extern struct bus_type sbus_bus_type;
-
-#define of_bus_type	of_platform_bus_type	/* for compatibility */
-
-#endif	/* _ASM_SPARC_OF_PLATFORM_H */
arch/sparc/include/asm/of_platform_64.h deleted +0 -25
deleted file mode 100644
index 4f66a5f..0000000
@@ -1,25 +0,0 @@
-#ifndef _ASM_SPARC64_OF_PLATFORM_H
-#define _ASM_SPARC64_OF_PLATFORM_H
-/*
- *    Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.
- *			 <[email protected]>
- *    Modified for Sparc by merging parts of asm/of_device.h
- *		by Stephen Rothwell
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version
- *  2 of the License, or (at your option) any later version.
- *
- */
-
-/* This is just here during the transition */
-#include <linux/of_platform.h>
-
-extern struct bus_type isa_bus_type;
-extern struct bus_type ebus_bus_type;
-extern struct bus_type sbus_bus_type;
-
-#define of_bus_type	of_platform_bus_type	/* for compatibility */
-
-#endif	/* _ASM_SPARC64_OF_PLATFORM_H */
Signature · 6 lines
1.5.6.3

-- 
Cheers,
Stephen Rothwell                    [email protected]
IBM OzLabs Linux Technology Centre
maintainer
#1 lore raw

From: Stephen Rothwell <[email protected]>
Date: Wed, 30 Jul 2008 14:59:13 +1000

Quoted 4 lines

The only difference between these files is that the 64 bit version has an extra declaration.

The isa_bus_type is a vestige which I forgot to delete when I removed the ISA bus layer from sparc and sparc64. It can be safely deleted.

I'm going to kill it, then rework your patch to go on top of that.

Thanks!