[PATCH] ia64: small sn2 cleanup

Attached is a small cleanup patch for the sn2 header files which removes
some cases of excessive header file inclusion.

diff --git a/include/asm-ia64/sn/ksys/elsc.h b/include/asm-ia64/sn/ksys/elsc.h
index aa8272ad85804fc9de95fac3d969fd82c35abaf6..987cc1b17e7e0a55aafcd0154173f4c4b7e6005c 100644 (file)
--- a/include/asm-ia64/sn/ksys/elsc.h
+++ b/include/asm-ia64/sn/ksys/elsc.h
@@ -9,9 +9,6 @@
 #ifndef _ASM_SN_KSYS_ELSC_H
 #define _ASM_SN_KSYS_ELSC_H
 
-#include <linux/config.h>
-#include <asm/sn/ksys/l1.h>
-
 /*
  * Error codes
  *

diff --git a/include/asm-ia64/sn/ksys/l1.h b/include/asm-ia64/sn/ksys/l1.h
index beb89ad4cd1ac75c7325249c19c615a959064114..b7386fdbe50fdd03f0e10aaa768c0da2d14ad4cc 100644 (file)
--- a/include/asm-ia64/sn/ksys/l1.h
+++ b/include/asm-ia64/sn/ksys/l1.h
@@ -10,10 +10,7 @@
 #ifndef _ASM_SN_KSYS_L1_H
 #define _ASM_SN_KSYS_L1_H
 
-#include <linux/config.h>
-#include <asm/sn/vector.h>
-#include <asm/sn/addrs.h>
-#include <asm/atomic.h>
+#include <asm/sn/types.h>
 
 /* L1 Target Addresses */
 /*
@@ -39,18 +36,6 @@
 #define L1_ADDR_TASK_BEDROCK   0x05    /* bedrock              */
 #define L1_ADDR_TASK_GENERAL   0x06    /* general requests     */
 
-#define L1_ADDR_LOCAL                          \
-    (L1_ADDR_TYPE_L1 << L1_ADDR_TYPE_SHFT) |   \
-    (L1_ADDR_RACK_LOCAL << L1_ADDR_RACK_SHFT) |        \
-    (L1_ADDR_BAY_LOCAL << L1_ADDR_BAY_SHFT)
-
-#define L1_ADDR_LOCALIO                                        \
-    (L1_ADDR_TYPE_IOBRICK << L1_ADDR_TYPE_SHFT) |      \
-    (L1_ADDR_RACK_LOCAL << L1_ADDR_RACK_SHFT) |                \
-    (L1_ADDR_BAY_LOCAL << L1_ADDR_BAY_SHFT)
-
-#define L1_ADDR_LOCAL_SHFT     L1_ADDR_BAY_SHFT
-
 /* response argument types */
 #define L1_ARG_INT             0x00    /* 4-byte integer (big-endian)  */
 #define L1_ARG_ASCII           0x01    /* null-terminated ASCII string */
@@ -133,18 +118,6 @@
 #define L1_EEP_IUSE            3       /* internal use area */
 #define L1_EEP_SPD             4       /* serial presence detect record */
 
-typedef uint32_t l1addr_t;
-
-#define L1_BUILD_ADDR(addr,at,r,s,t)                                   \
-    (*(l1addr_t *)(addr) = ((l1addr_t)(at) << L1_ADDR_TYPE_SHFT) |     \
-                            ((l1addr_t)(r)  << L1_ADDR_RACK_SHFT) |    \
-                            ((l1addr_t)(s)  << L1_ADDR_BAY_SHFT) |     \
-                            ((l1addr_t)(t)  << L1_ADDR_TASK_SHFT))
-
-#define L1_ADDRESS_TO_TASK(addr,trb,tsk)                               \
-    (*(l1addr_t *)(addr) = (l1addr_t)(trb) |                           \
-                            ((l1addr_t)(tsk) << L1_ADDR_TASK_SHFT))
-
 #define L1_DISPLAY_LINE_LENGTH 12      /* L1 display characters/line */
 
 #ifdef L1_DISP_2LINES
@@ -154,11 +127,9 @@ typedef uint32_t l1addr_t;
                                         * to system software */
 #endif
 
-#define bzero(d, n)    memset((d), 0, (n))
-
 int    elsc_display_line(nasid_t nasid, char *line, int lnum);
-int    iobrick_rack_bay_type_get( nasid_t nasid, uint *rack,
-                                  uint *bay, uint *brick_type );
+int    iobrick_rack_bay_type_get( nasid_t nasid, unsigned int *rack,
+                                  unsigned int *bay, unsigned int *brick_type );
 int    iobrick_module_get( nasid_t nasid );
 
 

diff --git a/include/asm-ia64/sn/pci/pcibr_private.h b/include/asm-ia64/sn/pci/pcibr_private.h
index 6e1cfde2c993f1348523d86dc1aeeb950cd2335f..6c120927249c7a5ed41e386166c2fc867d6c14e8 100644 (file)
--- a/include/asm-ia64/sn/pci/pcibr_private.h
+++ b/include/asm-ia64/sn/pci/pcibr_private.h
@@ -15,11 +15,9 @@
  * should ever peek into this file.
  */
 
-#include <linux/config.h>
 #include <linux/pci.h>
 #include <asm/sn/pci/pcibr.h>
 #include <asm/sn/pci/pciio_private.h>
-#include <asm/sn/ksys/l1.h>
 
 /*
  * convenience typedefs