[PATCH] nubus: Kill nubus_proc_detach_device()

[PATCH] nubus: Kill nubus_proc_detach_device()

[Geert Uytterhoeven]

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>
---
 drivers/nubus/proc.c  |   15 ---------------
 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 b8286ed..5371b37 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 b374052..6165b2c 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,
-- 
1.7.0.4

Re: [PATCH] nubus: Kill nubus_proc_detach_device()

[David Howells]

Geert Uytterhoeven <geert@linux-m68k.org> wrote:

> 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>

Fine by me.

Acked-by: David Howells <dhowells@redhat.com>