From: David Mosberger Date: Fri, 26 Sep 2003 06:51:29 +0000 (-0700) Subject: ia64: Patch by Christoph Hellwig: SN2 stopped abusing devfs in 2.5, clean X-Git-Tag: v2.6.0-test6~23^2~9 X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=6c49eee67ba34d5bd391a6d81f96ee9786e746aa;p=history.git 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 a361ba8c9357..aa67dd44afc6 100644 --- a/arch/ia64/sn/io/drivers/ioconfig_bus.c +++ b/arch/ia64/sn/io/drivers/ioconfig_bus.c @@ -17,8 +17,6 @@ #include #include -#include -#include #include #include #include @@ -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 209c5a0b2093..b501ab2a76b3 100644 --- a/arch/ia64/sn/io/machvec/pci_dma.c +++ b/arch/ia64/sn/io/machvec/pci_dma.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include diff --git a/arch/ia64/sn/io/sn2/pciio.c b/arch/ia64/sn/io/sn2/pciio.c index 0c51f37f5393..17c9e96538dd 100644 --- 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 2afe2ce0c2a7..92a8c3891b41 100644 --- 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 5a083a1693f5..2e93d16a54ed 100644 --- 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 - 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 171b37dc64eb..07da65e5b9e0 100644 --- a/include/asm-ia64/sn/ioerror_handling.h +++ b/include/asm-ia64/sn/ioerror_handling.h @@ -10,7 +10,6 @@ #include #include -#include #include #if __KERNEL__ diff --git a/include/asm-ia64/sn/labelcl.h b/include/asm-ia64/sn/labelcl.h index 488245f721b3..60e5920e0a16 100644 --- 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 77cd3bf944ee..241d642dacfc 100644 --- a/include/asm-ia64/sn/sgi.h +++ b/include/asm-ia64/sn/sgi.h @@ -16,7 +16,6 @@ #include #include /* for copy_??_user */ #include -#include #include #include diff --git a/include/asm-ia64/sn/xtalk/xbow_info.h b/include/asm-ia64/sn/xtalk/xbow_info.h index ccfc3348652b..def64d630b7a 100644 --- 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 -#include #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 a406bea97d59..edf0b8327a3d 100644 --- a/include/asm-ia64/sn/xtalk/xswitch.h +++ b/include/asm-ia64/sn/xtalk/xswitch.h @@ -17,7 +17,6 @@ #ifndef __ASSEMBLY__ -#include #include 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 cfa029d0fe4c..13e7a00b249e 100644 --- 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 /* for error function and arg types */ -#include #include #include