Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Geert Uytterhoeven and committed by
Al Viro
e765acb4 60b7bf4e

-16
-15
drivers/nubus/proc.c
··· 147 147 } 148 148 EXPORT_SYMBOL(nubus_proc_attach_device); 149 149 150 - /* FIXME: this is certainly broken! */ 151 - int nubus_proc_detach_device(struct nubus_dev *dev) 152 - { 153 - struct proc_dir_entry *e; 154 - 155 - if ((e = dev->procdir)) { 156 - if (atomic_read(&e->count)) 157 - return -EBUSY; 158 - remove_proc_entry(e->name, proc_bus_nubus_dir); 159 - dev->procdir = NULL; 160 - } 161 - return 0; 162 - } 163 - EXPORT_SYMBOL(nubus_proc_detach_device); 164 - 165 150 /* 166 151 * /proc/nubus stuff 167 152 */
-1
include/linux/nubus.h
··· 87 87 #endif 88 88 int get_nubus_list(char *buf); 89 89 int nubus_proc_attach_device(struct nubus_dev *dev); 90 - int nubus_proc_detach_device(struct nubus_dev *dev); 91 90 /* If we need more precision we can add some more of these */ 92 91 struct nubus_dev* nubus_find_device(unsigned short category, 93 92 unsigned short type,