nubus: Kill nubus_proc_detach_device() (e765acb4) · Commits · 戴 / test

Commit ("proc: Move non-public stuff from linux/proc_fs.h to fs/proc/internal.h") broke Apple NuBus support: drivers/nubus/proc.c: In function ‘nubus_proc_detach_device’: drivers/nubus/proc.c:156: error: dereferencing pointer to incomplete type drivers/nubus/proc.c:158: error: dereferencing pointer to incomplete type Fortunately nubus_proc_detach_device() is unused, and appears to have never been used, so just remove it. Signed-off-by:

Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by:

Al Viro <viro@zeniv.linux.org.uk>

drivers/nubus/proc.c

+0 −15

Original line number	Diff line number	Diff line
		@@ -147,21 +147,6 @@ int nubus_proc_attach_device(struct nubus_dev *dev)
		}
		EXPORT_SYMBOL(nubus_proc_attach_device);

		/* FIXME: this is certainly broken! */
		int nubus_proc_detach_device(struct nubus_dev *dev)
		{
		struct proc_dir_entry *e;

		if ((e = dev->procdir)) {
		if (atomic_read(&e->count))
		return -EBUSY;
		remove_proc_entry(e->name, proc_bus_nubus_dir);
		dev->procdir = NULL;
		}
		return 0;
		}
		EXPORT_SYMBOL(nubus_proc_detach_device);

		/*
		* /proc/nubus stuff
		*/

include/linux/nubus.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -87,7 +87,6 @@ static inline void nubus_proc_init(void) {}
		#endif
		int get_nubus_list(char *buf);
		int nubus_proc_attach_device(struct nubus_dev *dev);
		int nubus_proc_detach_device(struct nubus_dev *dev);
		/* If we need more precision we can add some more of these */
		struct nubus_dev* nubus_find_device(unsigned short category,
		unsigned short type,

Admin message