Documentation: move driver-api/isapnp to userspace-api/

driver-api/isapnp documents /proc interfaces for interfacing directly
with ISA Plug & Play devices, not any kind of API for kernel developers,
and should thus also live under userspace-api/.

Also fix a few issues while we're at it.

Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
Reviewed-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Link: https://lore.kernel.org/r/20231221124816.2978000-2-vegard.nossum@oracle.com

diff --git a/Documentation/driver-api/index.rst b/Documentation/driver-api/index.rst
index 9511db3034467a7ea556b45a921a7d4a445bf6be..b1b82ac1063b9d1244ce105f97b925bda75f4d7e 100644 (file)
--- a/Documentation/driver-api/index.rst
+++ b/Documentation/driver-api/index.rst
@@ -81,7 +81,6 @@ available subsections can be seen below.
    dcdbas
    eisa
    isa
-   isapnp
    io-mapping
    io_ordering
    generic-counter

diff --git a/Documentation/userspace-api/index.rst b/Documentation/userspace-api/index.rst
index 93174ffc7350bd0a547028b746994624284e991d..277b7a40ca91e652ed809739afea4bfa73e2c5f8 100644 (file)
--- a/Documentation/userspace-api/index.rst
+++ b/Documentation/userspace-api/index.rst
@@ -31,6 +31,7 @@ place where this information is gathered.
    vduse
    futex2
    tee
+   isapnp
 
 .. only::  subproject and html
 

diff --git a/Documentation/driver-api/isapnp.rst b/Documentation/userspace-api/isapnp.rst
similarity index 51%
rename from Documentation/driver-api/isapnp.rst
rename to Documentation/userspace-api/isapnp.rst
index 8d0840ac847bfcc0223aee7a170f25a18d36861b..d6fceb19b8ae6a0c18800df6a5c4ee9c3a432dc6 100644 (file)
--- a/Documentation/driver-api/isapnp.rst
+++ b/Documentation/userspace-api/isapnp.rst
@@ -1,11 +1,11 @@
-==========================================================
-ISA Plug & Play support by Jaroslav Kysela <perex@suse.cz>
-==========================================================
+=======================
+ISA Plug & Play support
+=======================
 
 Interface /proc/isapnp
 ======================
 
-The interface has been removed. See pnp.txt for more details.
+The interface was removed in kernel 2.5.53. See pnp.rst for more details.
 
 Interface /proc/bus/isapnp
 ==========================

diff --git a/MAINTAINERS b/MAINTAINERS
index 9393c9b35f4dd02e4aacfe1275c10de9873b75d4..cbafd63abacc25320be0484c42f961d22baf6526 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11252,7 +11252,7 @@ F:      drivers/media/radio/radio-isa*
 ISAPNP
 M:     Jaroslav Kysela <perex@perex.cz>
 S:     Maintained
-F:     Documentation/driver-api/isapnp.rst
+F:     Documentation/userspace-api/isapnp.rst
 F:     drivers/pnp/isapnp/
 F:     include/linux/isapnp.h
 

diff --git a/drivers/pnp/isapnp/Kconfig b/drivers/pnp/isapnp/Kconfig
index d0479a563123a0c13420c061f143c22ebf96fe0d..8b5f2e461a80b96262cba059f9d7ba373d0e8a30 100644 (file)
--- a/drivers/pnp/isapnp/Kconfig
+++ b/drivers/pnp/isapnp/Kconfig
@@ -7,6 +7,6 @@ config ISAPNP
        depends on ISA || COMPILE_TEST
        help
          Say Y here if you would like support for ISA Plug and Play devices.
-         Some information is in <file:Documentation/driver-api/isapnp.rst>.
+         Some information is in <file:Documentation/userspace-api/isapnp.rst>.
 
          If unsure, say Y.