nubus: kill drivers/nubus/nubus_syms.c (99ffab81) · Commits · 戴 / test

drivers/nubus/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -4,5 +4,4 @@

		obj-y := nubus.o

		obj-$(CONFIG_MODULES) += nubus_syms.o
		obj-$(CONFIG_PROC_FS) += proc.o

drivers/nubus/nubus.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		#include <linux/errno.h>
		#include <linux/init.h>
		#include <linux/delay.h>
		#include <linux/module.h>
		#include <asm/setup.h>
		#include <asm/system.h>
		#include <asm/page.h>
		@@ -186,6 +187,7 @@ void nubus_get_rsrc_mem(void dest, const struct nubus_dirent dirent,
		len--;
		}
		}
		EXPORT_SYMBOL(nubus_get_rsrc_mem);

		void nubus_get_rsrc_str(void dest, const struct nubus_dirent dirent,
		int len)
		@@ -200,6 +202,7 @@ void nubus_get_rsrc_str(void dest, const struct nubus_dirent dirent,
		len--;
		}
		}
		EXPORT_SYMBOL(nubus_get_rsrc_str);

		int nubus_get_root_dir(const struct nubus_board* board,
		struct nubus_dir* dir)
		@@ -209,6 +212,7 @@ int nubus_get_root_dir(const struct nubus_board* board,
		dir->mask = board->lanes;
		return 0;
		}
		EXPORT_SYMBOL(nubus_get_root_dir);

		/* This is a slyly renamed version of the above */
		int nubus_get_func_dir(const struct nubus_dev* dev,
		@@ -219,6 +223,7 @@ int nubus_get_func_dir(const struct nubus_dev* dev,
		dir->mask = dev->board->lanes;
		return 0;
		}
		EXPORT_SYMBOL(nubus_get_func_dir);

		int nubus_get_board_dir(const struct nubus_board* board,
		struct nubus_dir* dir)
		@@ -237,6 +242,7 @@ int nubus_get_board_dir(const struct nubus_board* board,
		return -1;
		return 0;
		}
		EXPORT_SYMBOL(nubus_get_board_dir);

		int nubus_get_subdir(const struct nubus_dirent *ent,
		struct nubus_dir *dir)
		@@ -246,6 +252,7 @@ int nubus_get_subdir(const struct nubus_dirent *ent,
		dir->mask = ent->mask;
		return 0;
		}
		EXPORT_SYMBOL(nubus_get_subdir);

		int nubus_readdir(struct nubus_dir nd, struct nubus_dirent ent)
		{
		@@ -274,12 +281,14 @@ int nubus_readdir(struct nubus_dir nd, struct nubus_dirent ent)
		ent->mask = nd->mask;
		return 0;
		}
		EXPORT_SYMBOL(nubus_readdir);

		int nubus_rewinddir(struct nubus_dir* dir)
		{
		dir->ptr = dir->base;
		return 0;
		}
		EXPORT_SYMBOL(nubus_rewinddir);

		/* Driver interface functions, more or less like in pci.c */

		@@ -303,6 +312,7 @@ nubus_find_device(unsigned short category,
		}
		return NULL;
		}
		EXPORT_SYMBOL(nubus_find_device);

		struct nubus_dev*
		nubus_find_type(unsigned short category,
		@@ -320,6 +330,7 @@ nubus_find_type(unsigned short category,
		}
		return NULL;
		}
		EXPORT_SYMBOL(nubus_find_type);

		struct nubus_dev*
		nubus_find_slot(unsigned int slot,
		@@ -335,6 +346,7 @@ nubus_find_slot(unsigned int slot,
		}
		return NULL;
		}
		EXPORT_SYMBOL(nubus_find_slot);

		int
		nubus_find_rsrc(struct nubus_dir* dir, unsigned char rsrc_type,
		@@ -346,6 +358,7 @@ nubus_find_rsrc(struct nubus_dir* dir, unsigned char rsrc_type,
		}
		return -1;
		}
		EXPORT_SYMBOL(nubus_find_rsrc);

		/* Initialization functions - decide which slots contain stuff worth
		looking at, and print out lots and lots of information from the

drivers/nubus/nubus_syms.c

deleted100644 → 0

+0 −28

Original line number	Diff line number	Diff line
		/* Exported symbols for NuBus services

		(c) 1999 David Huggins-Daines <dhd@debian.org> */

		#include <linux/module.h>
		#include <linux/types.h>
		#include <linux/nubus.h>

		#ifdef CONFIG_PROC_FS
		EXPORT_SYMBOL(nubus_proc_attach_device);
		EXPORT_SYMBOL(nubus_proc_detach_device);
		#endif

		MODULE_LICENSE("GPL");

		EXPORT_SYMBOL(nubus_find_device);
		EXPORT_SYMBOL(nubus_find_type);
		EXPORT_SYMBOL(nubus_find_slot);
		EXPORT_SYMBOL(nubus_get_root_dir);
		EXPORT_SYMBOL(nubus_get_board_dir);
		EXPORT_SYMBOL(nubus_get_func_dir);
		EXPORT_SYMBOL(nubus_readdir);
		EXPORT_SYMBOL(nubus_find_rsrc);
		EXPORT_SYMBOL(nubus_rewinddir);
		EXPORT_SYMBOL(nubus_get_subdir);
		EXPORT_SYMBOL(nubus_get_rsrc_mem);
		EXPORT_SYMBOL(nubus_get_rsrc_str);

drivers/nubus/proc.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@
		#include <linux/nubus.h>
		#include <linux/proc_fs.h>
		#include <linux/init.h>
		#include <linux/module.h>

		#include <asm/uaccess.h>
		#include <asm/byteorder.h>

		@@ -140,6 +142,7 @@ int nubus_proc_attach_device(struct nubus_dev *dev)

		return 0;
		}
		EXPORT_SYMBOL(nubus_proc_attach_device);

		/* FIXME: this is certainly broken! */
		int nubus_proc_detach_device(struct nubus_dev *dev)
		@@ -154,6 +157,7 @@ int nubus_proc_detach_device(struct nubus_dev *dev)
		}
		return 0;
		}
		EXPORT_SYMBOL(nubus_proc_detach_device);

		void __init proc_bus_nubus_add_devices(void)
		{

Admin message