diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-05-03 22:20:38 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-05-04 20:47:26 +0200 |
| commit | e765acb4673f377c53505c01279c040906bd706e (patch) | |
| tree | a0ab507a1136cbf986f55bf568ad8d54b0e9b525 | |
| parent | more mode_t whack-a-mole... (diff) | |
| download | linux-e765acb4673f377c53505c01279c040906bd706e.tar.xz linux-e765acb4673f377c53505c01279c040906bd706e.zip | |
nubus: Kill nubus_proc_detach_device()
Commit 59d8053f1e16904d54ed7469d4b36801ea6b8f2c ("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>
| -rw-r--r-- | drivers/nubus/proc.c | 15 | ||||
| -rw-r--r-- | include/linux/nubus.h | 1 |
2 files changed, 0 insertions, 16 deletions
diff --git a/drivers/nubus/proc.c b/drivers/nubus/proc.c index b8286ed65919..5371b374f1fe 100644 --- a/drivers/nubus/proc.c +++ b/drivers/nubus/proc.c @@ -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 */ diff --git a/include/linux/nubus.h b/include/linux/nubus.h index b3740527571a..6165b2c62040 100644 --- a/include/linux/nubus.h +++ b/include/linux/nubus.h @@ -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, |