diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-05-03 16:20:38 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-05-04 14:47:26 -0400 |
commit | e765acb4673f377c53505c01279c040906bd706e (patch) | |
tree | a0ab507a1136cbf986f55bf568ad8d54b0e9b525 | |
parent | 60b7bf4e61dd45e2fe06bd16ba04984405b564f1 (diff) |
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) | |||
147 | } | 147 | } |
148 | EXPORT_SYMBOL(nubus_proc_attach_device); | 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 | * /proc/nubus stuff | 151 | * /proc/nubus stuff |
167 | */ | 152 | */ |
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) {} | |||
87 | #endif | 87 | #endif |
88 | int get_nubus_list(char *buf); | 88 | int get_nubus_list(char *buf); |
89 | int nubus_proc_attach_device(struct nubus_dev *dev); | 89 | int nubus_proc_attach_device(struct nubus_dev *dev); |
90 | int nubus_proc_detach_device(struct nubus_dev *dev); | ||
91 | /* If we need more precision we can add some more of these */ | 90 | /* If we need more precision we can add some more of these */ |
92 | struct nubus_dev* nubus_find_device(unsigned short category, | 91 | struct nubus_dev* nubus_find_device(unsigned short category, |
93 | unsigned short type, | 92 | unsigned short type, |