ia64: Patch by Christoph Hellwig: SN2 stopped abusing devfs in 2.5, clean

	up the leftovers.

diff --git a/arch/ia64/sn/io/drivers/ioconfig_bus.c b/arch/ia64/sn/io/drivers/ioconfig_bus.c
index a361ba8c93576f067635706baf47c1238ee4756d..aa67dd44afc6c02e0b0a80d84b35c9087a728333 100644 (file)
--- a/arch/ia64/sn/io/drivers/ioconfig_bus.c
+++ b/arch/ia64/sn/io/drivers/ioconfig_bus.c
@@ -17,8 +17,6 @@
 #include <linux/pci.h>
 
 #include <asm/sn/sgi.h>
-#include <linux/devfs_fs.h>
-#include <linux/devfs_fs_kernel.h>
 #include <asm/io.h>
 #include <asm/sn/iograph.h>
 #include <asm/sn/invent.h>
@@ -354,7 +352,7 @@ struct file_operations ioconfig_bus_fops = {
 
 /*
  * init_ifconfig_bus() - Boot time initialization.  Ensure that it is called 
- *     after devfs has been initialized.
+ *     after hwgfs has been initialized.
  *
  */
 int init_ioconfig_bus(void)

diff --git a/arch/ia64/sn/io/machvec/pci_dma.c b/arch/ia64/sn/io/machvec/pci_dma.c
index 209c5a0b20931a20322cb20c564be879d3d07c37..b501ab2a76b35620da99c8dcfd1ff43b2aa0f73c 100644 (file)
--- a/arch/ia64/sn/io/machvec/pci_dma.c
+++ b/arch/ia64/sn/io/machvec/pci_dma.c
@@ -15,7 +15,6 @@
 #include <linux/string.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/module.h>
 
 #include <asm/delay.h>

diff --git a/arch/ia64/sn/io/sn2/pciio.c b/arch/ia64/sn/io/sn2/pciio.c
index 0c51f37f5393f22b8b806f5f802fb0e4d12249e3..17c9e96538dd914b69f993a4955512342a90de6c 100644 (file)
--- a/arch/ia64/sn/io/sn2/pciio.c
+++ b/arch/ia64/sn/io/sn2/pciio.c
@@ -947,15 +947,6 @@ pciio_info_get(vertex_hdl_t pciio)
 
     pciio_info = (pciio_info_t) hwgraph_fastinfo_get(pciio);
 
-#ifdef DEBUG_PCIIO
-    {
-       int pos;
-       char dname[256];
-       pos = devfs_generate_path(pciio, dname, 256);
-       printk("%s : path= %s\n", __FUNCTION__, &dname[pos]);
-    }
-#endif /* DEBUG_PCIIO */
-
     if ((pciio_info != NULL) &&
         (pciio_info->c_fingerprint != pciio_info_fingerprint)
         && (pciio_info->c_fingerprint != NULL)) {
@@ -1212,14 +1203,6 @@ pciio_device_info_register(
 
     pciio_info->c_vertex = pconn;
     pciio_info_set(pconn, pciio_info);
-#ifdef DEBUG_PCIIO
-    {
-       int pos;
-       char dname[256];
-       pos = devfs_generate_path(pconn, dname, 256);
-       printk("%s : pconn path= %s \n", __FUNCTION__, &dname[pos]);
-    }
-#endif /* DEBUG_PCIIO */
 
     /*
      * create link to our pci provider

diff --git a/arch/ia64/sn/io/sn2/xbow.c b/arch/ia64/sn/io/sn2/xbow.c
index 2afe2ce0c2a7f14df20138b6df229d1d42c35de8..92a8c3891b41ede23779ad1e1f5016a13ba60edd 100644 (file)
--- a/arch/ia64/sn/io/sn2/xbow.c
+++ b/arch/ia64/sn/io/sn2/xbow.c
@@ -257,7 +257,7 @@ xbow_attach(vertex_hdl_t conn)
      */
 
     /*
-     * Register a xbow driver with devfs.
+     * Register a xbow driver with hwgraph.
      * file ops.
      */
     vhdl = NULL;

diff --git a/include/asm-ia64/sn/hcl_util.h b/include/asm-ia64/sn/hcl_util.h
index 5a083a1693f5e37fc6a7fdf68b01c7120b06d222..2e93d16a54ed58323d077cfbb399548fd7dc79f4 100644 (file)
--- a/include/asm-ia64/sn/hcl_util.h
+++ b/include/asm-ia64/sn/hcl_util.h
@@ -10,8 +10,6 @@
 #ifndef _ASM_IA64_SN_HCL_UTIL_H
 #define _ASM_IA64_SN_HCL_UTIL_H
 
-#include <linux/devfs_fs_kernel.h>
-
 extern char * dev_to_name(vertex_hdl_t, char *, uint);
 extern int device_master_set(vertex_hdl_t, vertex_hdl_t);
 extern vertex_hdl_t device_master_get(vertex_hdl_t);

diff --git a/include/asm-ia64/sn/ioerror_handling.h b/include/asm-ia64/sn/ioerror_handling.h
index 171b37dc64eb9f091dd8eee66d11bde5e37e1eb4..07da65e5b9e05b5486e7fb39c2fc399dfb408e33 100644 (file)
--- a/include/asm-ia64/sn/ioerror_handling.h
+++ b/include/asm-ia64/sn/ioerror_handling.h
@@ -10,7 +10,6 @@
 
 #include <linux/config.h>
 #include <linux/types.h>
-#include <linux/devfs_fs_kernel.h>
 #include <asm/sn/sgi.h>
 
 #if __KERNEL__

diff --git a/include/asm-ia64/sn/labelcl.h b/include/asm-ia64/sn/labelcl.h
index 488245f721b3c3b7c700ebe511fc99a4ad88d284..60e5920e0a164a2be1f49f412935e43b0308e83a 100644 (file)
--- a/include/asm-ia64/sn/labelcl.h
+++ b/include/asm-ia64/sn/labelcl.h
@@ -40,7 +40,7 @@ typedef struct label_info_s {
 /*
  * Definition of the data structure that provides the link to 
  * the hwgraph fastinfo and the label entries associated with a 
- * particular devfs entry.
+ * particular hwgraph entry.
  */
 typedef struct labelcl_info_s {
        unsigned long   hwcl_magic;
@@ -87,6 +87,5 @@ extern int labelcl_info_replace_IDX(vertex_hdl_t, int, arbitrary_info_t,
                        arbitrary_info_t *);
 extern int labelcl_info_connectpt_set(vertex_hdl_t, vertex_hdl_t);
 extern int labelcl_info_get_IDX(vertex_hdl_t, int, arbitrary_info_t *);
-extern struct devfs_handle_t device_info_connectpt_get(vertex_hdl_t);
 
 #endif /* _ASM_IA64_SN_LABELCL_H */

diff --git a/include/asm-ia64/sn/sgi.h b/include/asm-ia64/sn/sgi.h
index 77cd3bf944eef2f671672ff4a06f3de8d79bdfff..241d642dacfc4d52fbf531c8b29b67f5c241e719 100644 (file)
--- a/include/asm-ia64/sn/sgi.h
+++ b/include/asm-ia64/sn/sgi.h
@@ -16,7 +16,6 @@
 #include <asm/sn/types.h>
 #include <asm/uaccess.h>               /* for copy_??_user */
 #include <linux/mm.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/fs.h>
 #include <asm/sn/hwgfs.h>
 

diff --git a/include/asm-ia64/sn/xtalk/xbow_info.h b/include/asm-ia64/sn/xtalk/xbow_info.h
index ccfc3348652b130fbe850a59077391f73ee61172..def64d630b7a415d37689402719c749a257a0b05 100644 (file)
--- a/include/asm-ia64/sn/xtalk/xbow_info.h
+++ b/include/asm-ia64/sn/xtalk/xbow_info.h
@@ -10,7 +10,6 @@
 #define _ASM_SN_XTALK_XBOW_INFO_H
 
 #include <linux/types.h>
-#include <linux/devfs_fs_kernel.h>
 
 #define XBOW_PERF_MODES               0x03
 #define XBOW_PERF_COUNTERS     0x02

diff --git a/include/asm-ia64/sn/xtalk/xswitch.h b/include/asm-ia64/sn/xtalk/xswitch.h
index a406bea97d598c5f09e7362a363f6733fd60416c..edf0b8327a3d9884a0c184670cd9eca23af2afac 100644 (file)
--- a/include/asm-ia64/sn/xtalk/xswitch.h
+++ b/include/asm-ia64/sn/xtalk/xswitch.h
@@ -17,7 +17,6 @@
 
 #ifndef __ASSEMBLY__
 
-#include <linux/devfs_fs_kernel.h>
 #include <asm/sn/xtalk/xtalk.h>
 
 typedef struct xswitch_info_s *xswitch_info_t;

diff --git a/include/asm-ia64/sn/xtalk/xtalk_private.h b/include/asm-ia64/sn/xtalk/xtalk_private.h
index cfa029d0fe4c3e26e9fc1e63bd47e25f451d3728..13e7a00b249e5d3411ea12d366cf3971ea8cc1c7 100644 (file)
--- a/include/asm-ia64/sn/xtalk/xtalk_private.h
+++ b/include/asm-ia64/sn/xtalk/xtalk_private.h
@@ -10,7 +10,6 @@
 #define _ASM_SN_XTALK_XTALK_PRIVATE_H
 
 #include <asm/sn/ioerror.h>        /* for error function and arg types */
-#include <linux/devfs_fs_kernel.h>
 #include <asm/sn/xtalk/xwidget.h>
 #include <asm/sn/xtalk/xtalk.h>