When trying to figure out why the "uhci-hcd" driver was so
much bigger than "usb-uhci-hcd" I noticed that most of it
was the /proc/driver/uhci support, and that if I tried to
disable it, I got compile-time warnings about things that
were defined but not referenced.

This patch makes that procfs support cleanly vanish if it's
configured out.  Please merge to Linus' latest.

(However, I suspect this should probably also be controlled
by the general USB debug support flag.)

- Dave
--- ./drivers/usb-dist/host/uhci-debug.c        Tue May 21 08:32:13 2002
+++ ./drivers/usb/host/uhci-debug.c     Fri Jun 21 07:08:09 2002
@@ -110,6 +110,7 @@
        return out - buf;
 }
 
+#ifdef CONFIG_PROC_FS
 static int uhci_show_sc(int port, unsigned short status, char *buf, int len)
 {
        char *out = buf;
@@ -185,6 +186,7 @@
 
        return out - buf;
 }
+#endif /* CONFIG_PROC_FS */
 
 static int uhci_show_qh(struct uhci_qh *qh, char *buf, int len, int space)
 {
@@ -285,6 +287,7 @@
        return out - buf;
 }
 
+#ifdef CONFIG_PROC_FS
 static const char *td_names[] = {"skel_int1_td", "skel_int2_td",
                                 "skel_int4_td", "skel_int8_td",
                                 "skel_int16_td", "skel_int32_td",
@@ -467,7 +470,6 @@
        return out - buf;
 }
 
-#ifdef CONFIG_PROC_FS
 #define MAX_OUTPUT     (PAGE_SIZE * 8)
 
 static struct proc_dir_entry *uhci_proc_root = NULL;

Reply via email to