Commit 6c49eee6 authored by David Mosberger's avatar David Mosberger

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

	up the leftovers.
parent ebee61d6
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <asm/sn/sgi.h> #include <asm/sn/sgi.h>
#include <linux/devfs_fs.h>
#include <linux/devfs_fs_kernel.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/sn/iograph.h> #include <asm/sn/iograph.h>
#include <asm/sn/invent.h> #include <asm/sn/invent.h>
...@@ -354,7 +352,7 @@ struct file_operations ioconfig_bus_fops = { ...@@ -354,7 +352,7 @@ struct file_operations ioconfig_bus_fops = {
/* /*
* init_ifconfig_bus() - Boot time initialization. Ensure that it is called * 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) int init_ioconfig_bus(void)
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/devfs_fs_kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <asm/delay.h> #include <asm/delay.h>
......
...@@ -947,15 +947,6 @@ pciio_info_get(vertex_hdl_t pciio) ...@@ -947,15 +947,6 @@ pciio_info_get(vertex_hdl_t pciio)
pciio_info = (pciio_info_t) hwgraph_fastinfo_get(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) && if ((pciio_info != NULL) &&
(pciio_info->c_fingerprint != pciio_info_fingerprint) (pciio_info->c_fingerprint != pciio_info_fingerprint)
&& (pciio_info->c_fingerprint != NULL)) { && (pciio_info->c_fingerprint != NULL)) {
...@@ -1212,14 +1203,6 @@ pciio_device_info_register( ...@@ -1212,14 +1203,6 @@ pciio_device_info_register(
pciio_info->c_vertex = pconn; pciio_info->c_vertex = pconn;
pciio_info_set(pconn, pciio_info); 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 * create link to our pci provider
......
...@@ -257,7 +257,7 @@ xbow_attach(vertex_hdl_t conn) ...@@ -257,7 +257,7 @@ xbow_attach(vertex_hdl_t conn)
*/ */
/* /*
* Register a xbow driver with devfs. * Register a xbow driver with hwgraph.
* file ops. * file ops.
*/ */
vhdl = NULL; vhdl = NULL;
......
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
#ifndef _ASM_IA64_SN_HCL_UTIL_H #ifndef _ASM_IA64_SN_HCL_UTIL_H
#define _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 char * dev_to_name(vertex_hdl_t, char *, uint);
extern int device_master_set(vertex_hdl_t, vertex_hdl_t); extern int device_master_set(vertex_hdl_t, vertex_hdl_t);
extern vertex_hdl_t device_master_get(vertex_hdl_t); extern vertex_hdl_t device_master_get(vertex_hdl_t);
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include <linux/config.h> #include <linux/config.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/devfs_fs_kernel.h>
#include <asm/sn/sgi.h> #include <asm/sn/sgi.h>
#if __KERNEL__ #if __KERNEL__
......
...@@ -40,7 +40,7 @@ typedef struct label_info_s { ...@@ -40,7 +40,7 @@ typedef struct label_info_s {
/* /*
* Definition of the data structure that provides the link to * Definition of the data structure that provides the link to
* the hwgraph fastinfo and the label entries associated with a * the hwgraph fastinfo and the label entries associated with a
* particular devfs entry. * particular hwgraph entry.
*/ */
typedef struct labelcl_info_s { typedef struct labelcl_info_s {
unsigned long hwcl_magic; unsigned long hwcl_magic;
...@@ -87,6 +87,5 @@ extern int labelcl_info_replace_IDX(vertex_hdl_t, int, arbitrary_info_t, ...@@ -87,6 +87,5 @@ extern int labelcl_info_replace_IDX(vertex_hdl_t, int, arbitrary_info_t,
arbitrary_info_t *); arbitrary_info_t *);
extern int labelcl_info_connectpt_set(vertex_hdl_t, vertex_hdl_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 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 */ #endif /* _ASM_IA64_SN_LABELCL_H */
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include <asm/sn/types.h> #include <asm/sn/types.h>
#include <asm/uaccess.h> /* for copy_??_user */ #include <asm/uaccess.h> /* for copy_??_user */
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/devfs_fs_kernel.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <asm/sn/hwgfs.h> #include <asm/sn/hwgfs.h>
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#define _ASM_SN_XTALK_XBOW_INFO_H #define _ASM_SN_XTALK_XBOW_INFO_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/devfs_fs_kernel.h>
#define XBOW_PERF_MODES 0x03 #define XBOW_PERF_MODES 0x03
#define XBOW_PERF_COUNTERS 0x02 #define XBOW_PERF_COUNTERS 0x02
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <linux/devfs_fs_kernel.h>
#include <asm/sn/xtalk/xtalk.h> #include <asm/sn/xtalk/xtalk.h>
typedef struct xswitch_info_s *xswitch_info_t; typedef struct xswitch_info_s *xswitch_info_t;
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#define _ASM_SN_XTALK_XTALK_PRIVATE_H #define _ASM_SN_XTALK_XTALK_PRIVATE_H
#include <asm/sn/ioerror.h> /* for error function and arg types */ #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/xwidget.h>
#include <asm/sn/xtalk/xtalk.h> #include <asm/sn/xtalk/xtalk.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment