isdn/capi: Make verbose reporting depend on capidrv

The Kconfig symbol ISDN_DRV_AVMB1_VERBOSE_REASON is only used for
capi_info2str(). That function is only used in capidrv.c. So setting it
without setting ISDN_CAPI_CAPIDRV is pointless. Make it depend on
ISDN_CAPI_CAPIDRV, rename it to ISDN_CAPI_CAPIDRV_VERBOSE and put its
entry after ISDN_CAPI_CAPIDRV's entry.

Since this symbol seems to be primarily used for debugging, keep it off
by default. By now the last users of capidrv hopefully know all they
need to know about the reasons for disconnecting.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/isdn/capi/Kconfig b/drivers/isdn/capi/Kconfig
index 9816c51eb5c240be8c19b9c26bbd25d50fbca652..1d7adff265f71fbeb0e0347c21489827eb73bb48 100644 (file)
--- a/drivers/isdn/capi/Kconfig
+++ b/drivers/isdn/capi/Kconfig
@@ -1,11 +1,3 @@
-config ISDN_DRV_AVMB1_VERBOSE_REASON
-       bool "Verbose reason code reporting"
-       default y
-       help
-         If you say Y here, the CAPI drivers will give verbose reasons for
-         disconnecting. This will increase the size of the kernel by 7 KB. If
-         unsure, say Y.
-
 config CAPI_TRACE
        bool "CAPI trace support"
        default y
@@ -42,3 +34,11 @@ config ISDN_CAPI_CAPIDRV
          the legacy isdn4linux link layer.  If you have a card which is
          supported by a CAPI driver, but still want to use old features like
          ippp interfaces or ttyI emulation, say Y/M here.
+
+config ISDN_CAPI_CAPIDRV_VERBOSE
+       bool "Verbose reason code reporting"
+       depends on ISDN_CAPI_CAPIDRV
+       help
+         If you say Y here, the capidrv interface will give verbose reasons
+         for disconnecting. This will increase the size of the kernel by 7 KB.
+         If unsure, say N.

diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index 70e67f6a22ff3bfde8dd3b5ec58365c9b7ff9d5e..fd6d28f3fc36e9223e759a1c3aaffa8b2de84641 100644 (file)
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -765,7 +765,7 @@ static inline int new_bchan(capidrv_contr *card)
 /* ------------------------------------------------------------------- */
 static char *capi_info2str(u16 reason)
 {
-#ifndef CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON
+#ifndef CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE
        return "..";
 #else
        switch (reason) {