Re: doc: Leftovers from CAPI remove?

[Arnd Bergmann]

On Thu, Apr 2, 2020 at 10:48 AM Alexander Dahl <post@xxxxxxxxxxx> wrote:
>
> Hei hei,
>
> when accidentally building an old Fritz PCI driver against v5.6.1 we
> hit this build error (which this mail is not about):
>
> /home/florian/.fbr/fbr-4.0-trunk-x86_64/buildroot/output/build/fcpci-2.6-43.x86_64-5.6.1/fritz/src/main.c:371:3:
> Fehler: Implizite Deklaration der Funktion Âregister_capi_driverÂ; meinten Sie Âregister_chrdevÂ?  [-Werror=implicit-function-declaration]
>
> A quick grep in master revealed there are still hints to the function
> 'register_capi_driver()' in file Documentation/isdn/interface_capi.rst
>
> I suppose after removing capi parts with f59aba2f7579 ("isdn: capi:
> dead code removal") and merging with 7ba31c3f2f1e ("Merge tag
> 'staging-5.6-rc1' of
> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging") these
> are leftovers in the documentation, which should be removed, right?

Ah, it seems I missed the removal of 'struct capi_driver' that is no longer
referenced anywhere. I removed the documentation for all code I removed,
but stopped after recursively removing more unused code after I had
not found much any more. I can submit this small patch if we think
it helps, though it wouldn't change much otherwise.

diff --git a/Documentation/isdn/interface_capi.rst
b/Documentation/isdn/interface_capi.rst
index fe2421444b76..897175cffd8f 100644
--- a/Documentation/isdn/interface_capi.rst
+++ b/Documentation/isdn/interface_capi.rst
@@ -70,19 +70,6 @@ messages for that application may be passed to or
from the device anymore.
 4. Data Structures
 ==================

-4.1 struct capi_driver
-----------------------
-
-This structure describes a Kernel CAPI driver itself. It is used in the
-register_capi_driver() and unregister_capi_driver() functions, and contains
-the following non-private fields, all to be set by the driver before calling
-register_capi_driver():
-
-``char name[32]``
-       the name of the driver, as a zero-terminated ASCII string
-``char revision[32]``
-       the revision number of the driver, as a zero-terminated ASCII string
-
 4.2 struct capi_ctr
 -------------------

diff --git a/include/linux/isdn/capilli.h b/include/linux/isdn/capilli.h
index 12be09b6883b..3c546103f60e 100644
--- a/include/linux/isdn/capilli.h
+++ b/include/linux/isdn/capilli.h
@@ -81,15 +81,4 @@ void capi_ctr_ready(struct capi_ctr * card);
 void capi_ctr_down(struct capi_ctr * card);
 void capi_ctr_handle_message(struct capi_ctr * card, u16 appl, struct
sk_buff *skb);

-// ---------------------------------------------------------------------------
-// needed for AVM capi drivers
-
-struct capi_driver {
-       char name[32];                          /* driver name */
-       char revision[32];
-
-       /* management information for kcapi */
-       struct list_head list;
-};
-
 #endif                         /* __CAPILLI_H__ */

> Âwe still have basic ISDN support in fli4l [1], although no one is
> motivated to maintain it, there are still users, mainly with local
> PBX installations â

Which of the many isdn stacks (i4l, kernelcapi, misdn, misdn2, ...)
do you think are still in use there? Do you know of CAPI users
that are forced to stay on linux-5.4.y after the removal?

      Arnd