[PNP]: Cleanup Kconfig

This patch cleans up the kconfig options for the pnp subsystem.  It
updates the comments and makes pnpbios proc support an optional
feature.

diff --git a/drivers/pnp/Kconfig b/drivers/pnp/Kconfig
index 7c2007c2eab4c064187fbe1cff3defc0ac4e1138..06c36cf1e4386e7cea4726caad5462263fc6103d 100644 (file)
--- a/drivers/pnp/Kconfig
+++ b/drivers/pnp/Kconfig
@@ -30,33 +30,9 @@ config PNP_DEBUG
 comment "Protocols"
        depends on PNP
 
-config ISAPNP
-       bool "ISA Plug and Play support (EXPERIMENTAL)"
-       depends on PNP && EXPERIMENTAL
-       help
-         Say Y here if you would like support for ISA Plug and Play devices.
-         Some information is in <file:Documentation/isapnp.txt>.
-
-         If unsure, say Y.
-
-config PNPBIOS
-       bool "Plug and Play BIOS support (EXPERIMENTAL)"
-       depends on PNP && EXPERIMENTAL
-       ---help---
-         Linux uses the PNPBIOS as defined in "Plug and Play BIOS
-         Specification Version 1.0A May 5, 1994" to autodetect built-in
-         mainboard resources (e.g. parallel port resources).
+source "drivers/pnp/isapnp/Kconfig"
 
-         Some features (e.g. event notification, docking station information,
-         ISAPNP services) are not used.
-
-         Note: ACPI is expected to supersede PNPBIOS some day, currently it
-         co-exists nicely.
-
-         See latest pcmcia-cs (stand-alone package) for a nice "lspnp" tools,
-         or have a look at /proc/bus/pnp.
-
-         If unsure, say Y.
+source "drivers/pnp/pnpbios/Kconfig"
 
 endmenu
 

diff --git a/drivers/pnp/isapnp/Kconfig b/drivers/pnp/isapnp/Kconfig
new file mode 100644 (file)
index 0000000..bb63261
--- /dev/null
+++ b/drivers/pnp/isapnp/Kconfig
@@ -0,0 +1,11 @@
+#
+# ISA Plug and Play configuration
+#
+config ISAPNP
+       bool "ISA Plug and Play support (EXPERIMENTAL)"
+       depends on PNP && EXPERIMENTAL
+       help
+         Say Y here if you would like support for ISA Plug and Play devices.
+         Some information is in <file:Documentation/isapnp.txt>.
+
+         If unsure, say Y.

diff --git a/drivers/pnp/pnpbios/Kconfig b/drivers/pnp/pnpbios/Kconfig
new file mode 100644 (file)
index 0000000..58eb949
--- /dev/null
+++ b/drivers/pnp/pnpbios/Kconfig
@@ -0,0 +1,41 @@
+#
+# Plug and Play BIOS configuration
+#
+config PNPBIOS
+       bool "Plug and Play BIOS support (EXPERIMENTAL)"
+       depends on PNP && EXPERIMENTAL
+       ---help---
+         Linux uses the PNPBIOS as defined in "Plug and Play BIOS
+         Specification Version 1.0A May 5, 1994" to autodetect built-in
+         mainboard resources (e.g. parallel port resources).
+
+         Some features (e.g. event notification, docking station information,
+         ISAPNP services) are not currently implemented.
+
+         If you would like the kernel to detect and allocate resources to
+         your mainboard devices (on some systems they are disabled by the
+         BIOS) say Y here.  Also the PNPBIOS can help prevent resource
+         conflicts between mainboard devices and other bus devices.
+
+         Note: ACPI is expected to supersede PNPBIOS some day, currently it
+         co-exists nicely.  If you have a non-ISA system that supports ACPI,
+         you probably don't need PNPBIOS support.
+
+config PNPBIOS_PROC_FS
+       bool "Plug and Play BIOS /proc interface"
+       depends on PNPBIOS && PROC_FS
+       ---help---
+         If you say Y here and to "/proc file system support", you will be
+         able to directly access the PNPBIOS.  This includes resource
+         allocation, ESCD, and other PNPBIOS services.  Using this
+         interface is potentially dangerous because the PNPBIOS driver will
+         not be notified of any resource changes made by writting directly.
+         Also some buggy systems will fault when accessing certain features
+         in the PNPBIOS /proc interface (e.g. "boot" configs).
+
+         See the latest pcmcia-cs (stand-alone package) for a nice set of
+         PNPBIOS /proc interface tools (lspnp and setpnp).
+
+         Unless you are debugging or have other specific reasons, it is
+         recommended that you say N here.
+

diff --git a/drivers/pnp/pnpbios/Makefile b/drivers/pnp/pnpbios/Makefile
index fe3dd8fba866f8ca7bd2cdaef05bc5b1de76b0bb..3cd3ed760605fbc7c6f5046bc4f714345aa3b01c 100644 (file)
--- a/drivers/pnp/pnpbios/Makefile
+++ b/drivers/pnp/pnpbios/Makefile
@@ -2,6 +2,6 @@
 # Makefile for the kernel PNPBIOS driver.
 #
 
-pnpbios-proc-$(CONFIG_PROC_FS) = proc.o
+pnpbios-proc-$(CONFIG_PNPBIOS_PROC_FS) = proc.o
 
 obj-y := core.o bioscalls.o rsparser.o $(pnpbios-proc-y)

diff --git a/drivers/pnp/pnpbios/pnpbios.h b/drivers/pnp/pnpbios/pnpbios.h
index 9287ffa46800190ff310c04d0518c1fa2797441a..01896e705ed45ad91348e34b60a27d7c6ad2fd40 100644 (file)
--- a/drivers/pnp/pnpbios/pnpbios.h
+++ b/drivers/pnp/pnpbios/pnpbios.h
@@ -36,7 +36,7 @@ extern void pnpid32_to_pnpid(u32 id, char *str);
 extern void pnpbios_print_status(const char * module, u16 status);
 extern void pnpbios_calls_init(union pnp_bios_install_struct * header);
 
-#ifdef CONFIG_PROC_FS
+#ifdef CONFIG_PNPBIOS_PROC_FS
 extern int pnpbios_interface_attach_device(struct pnp_bios_node * node);
 extern int pnpbios_proc_init (void);
 extern void pnpbios_proc_exit (void);
@@ -44,4 +44,4 @@ extern void pnpbios_proc_exit (void);
 static inline int pnpbios_interface_attach_device(struct pnp_bios_node * node) { return 0; }
 static inline int pnpbios_proc_init (void) { return 0; }
 static inline void pnpbios_proc_exit (void) { ; }
-#endif /* CONFIG_PROC */
+#endif /* CONFIG_PNPBIOS_PROC_FS */